From a5cfedcae953d55576c1e8f1ae9e5d6166c00094 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 15 Aug 2021 20:02:14 +0100
Subject: [PATCH] Exclude the .qortal metadata directory in all diffs. Also
 improved logging.

---
 .../qortal/arbitrary/ArbitraryDataDiff.java   | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
index b9d6e6e5..06976e72 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
@@ -54,7 +54,7 @@ public class ArbitraryDataDiff {
     }
 
     private void preExecute() {
-
+        LOGGER.info("Generating diff...");
     }
 
     private void postExecute() {
@@ -97,23 +97,28 @@ public class ArbitraryDataDiff {
                     Path filePathAfter = pathAfterAbsolute.relativize(after.toAbsolutePath());
                     Path filePathBefore = pathBeforeAbsolute.resolve(filePathAfter);
 
+                    if (filePathAfter.startsWith(".qortal")) {
+                        // Ignore the .qortal metadata folder
+                        return FileVisitResult.CONTINUE;
+                    }
+
                     boolean wasAdded = false;
                     boolean wasModified = false;
 
                     if (!Files.exists(filePathBefore)) {
-                        LOGGER.info("File was added: {}", after.toString());
+                        LOGGER.info("File was added: {}", filePathAfter.toString());
                         diff.addedPaths.add(filePathAfter);
                         wasAdded = true;
                     }
                     else if (Files.size(after) != Files.size(filePathBefore)) {
                         // Check file size first because it's quicker
-                        LOGGER.info("File size was modified: {}", after.toString());
+                        LOGGER.info("File size was modified: {}", filePathAfter.toString());
                         diff.modifiedPaths.add(filePathAfter);
                         wasModified = true;
                     }
                     else if (!Arrays.equals(ArbitraryDataDiff.digestFromPath(after), ArbitraryDataDiff.digestFromPath(filePathBefore))) {
                         // Check hashes as a last resort
-                        LOGGER.info("File contents were modified: {}", after.toString());
+                        LOGGER.info("File contents were modified: {}", filePathAfter.toString());
                         diff.modifiedPaths.add(filePathAfter);
                         wasModified = true;
                     }
@@ -148,7 +153,6 @@ public class ArbitraryDataDiff {
         try {
             final Path pathBeforeAbsolute = this.pathBefore.toAbsolutePath();
             final Path pathAfterAbsolute = this.pathAfter.toAbsolutePath();
-            final Path diffPathAbsolute = this.diffPath.toAbsolutePath();
             final ArbitraryDataDiff diff = this;
 
             // Check for removals
@@ -159,6 +163,11 @@ public class ArbitraryDataDiff {
                     Path directoryPathBefore = pathBeforeAbsolute.relativize(before.toAbsolutePath());
                     Path directoryPathAfter = pathAfterAbsolute.resolve(directoryPathBefore);
 
+                    if (directoryPathBefore.startsWith(".qortal")) {
+                        // Ignore the .qortal metadata folder
+                        return FileVisitResult.CONTINUE;
+                    }
+
                     if (!Files.exists(directoryPathAfter)) {
                         LOGGER.info("Directory was removed: {}", directoryPathAfter.toString());
                         diff.removedPaths.add(directoryPathBefore);
@@ -173,8 +182,13 @@ public class ArbitraryDataDiff {
                     Path filePathBefore = pathBeforeAbsolute.relativize(before.toAbsolutePath());
                     Path filePathAfter = pathAfterAbsolute.resolve(filePathBefore);
 
+                    if (filePathBefore.startsWith(".qortal")) {
+                        // Ignore the .qortal metadata folder
+                        return FileVisitResult.CONTINUE;
+                    }
+
                     if (!Files.exists(filePathAfter)) {
-                        LOGGER.trace("File was removed: {}", before.toString());
+                        LOGGER.trace("File was removed: {}", filePathBefore.toString());
                         diff.removedPaths.add(filePathBefore);
                     }