From be0426d9a2a71a2dd62a096186a18c89aaabff39 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 15 Aug 2021 19:19:55 +0100
Subject: [PATCH] Improved logging

---
 src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java | 1 +
 .../java/org/qortal/arbitrary/ArbitraryDataCombiner.java     | 3 +++
 src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java  | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
index 7bbf962d..7ef29d03 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
@@ -152,6 +152,7 @@ public class ArbitraryDataBuilder {
 
         // Loop from the second path onwards
         for (int i=1; i<paths.size(); i++) {
+            LOGGER.info(String.format("[%s][%s] Applying layer %d...", this.service, this.name, i));
             Path pathAfter = this.paths.get(i);
             ArbitraryDataCombiner combiner = new ArbitraryDataCombiner(pathBefore, pathAfter);
             combiner.combine();
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
index 73d18c22..08409784 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
@@ -7,6 +7,7 @@ import org.qortal.utils.FilesystemUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -55,6 +56,8 @@ public class ArbitraryDataCombiner {
         if (FilesystemUtils.pathInsideDataOrTempPath(parentDirectory)) {
             try {
                 Files.deleteIfExists(parentDirectory);
+            } catch (DirectoryNotEmptyException e) {
+                // No need to log anything
             } catch (IOException e) {
                 // This will eventually be cleaned up by a maintenance process, so log the error and continue
                 LOGGER.info("Unable to cleanup parent directory {}", parentDirectory.toString());
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
index 45c50afe..a15c7f0e 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
@@ -219,7 +219,8 @@ public class ArbitraryDataReader {
         if (!arbitraryDataFile.exists()) {
             if (!arbitraryDataFile.allChunksExist(chunkHashes)) {
                 // TODO: fetch them?
-                throw new IllegalStateException(String.format("Missing chunks for file {}", arbitraryDataFile));
+                LOGGER.info(String.format("Missing chunks for file {}", arbitraryDataFile));
+                throw new IllegalStateException(String.format("Missing chunks for file %s", arbitraryDataFile));
             }
             // We have all the chunks but not the complete file, so join them
             arbitraryDataFile.addChunkHashes(chunkHashes);
@@ -317,6 +318,8 @@ public class ArbitraryDataReader {
                     Files.deleteIfExists(parentDirectory);
                 }
 
+            } catch (DirectoryNotEmptyException e) {
+                    // No need to log anything
             } catch (IOException e) {
                 // This will eventually be cleaned up by a maintenance process, so log the error and continue
                 LOGGER.info("Unable to cleanup directories: {}", e.getMessage());