Fix file deletion for empty folders

TheCBProject · Apr 28, 2024 · 3ddf4bf · 3ddf4bf
1 parent d76586c
commit 3ddf4bf
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/main/java/codechicken/diffpatch/cli/PatchOperation.java b/src/main/java/codechicken/diffpatch/cli/PatchOperation.java
@@ -20,6 +20,7 @@
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import static codechicken.diffpatch.util.LogLevel.*;
 import static codechicken.diffpatch.util.Utils.filterPrefixed;
@@ -332,20 +333,22 @@ public boolean doPatch(FileCollector oCollector, FileCollector rCollector, Patch
         for (String file : removedFiles) {
             summary.removedFiles++;
             Path deletedFile = this.outputPath.toPath().resolve(file);
-
-            Files.walk(deletedFile)
-                    .sorted(Comparator.reverseOrder())
-                    .filter(Files::isDirectory)
-                    .filter(path -> {
-                        try {
-                            return !Files.list(path).findFirst().isPresent();
-                        } catch (IOException e) {
-                            return true;
-                        }
-                    })
-                    .map(Path::toFile)
-                    .forEach(File::delete);
             Files.delete(deletedFile);
+            try(Stream<Path> walker = Files.walk(this.outputPath.toPath())){
+                walker.sorted(Comparator.reverseOrder())
+                        .filter(Files::isDirectory)
+                        .filter(path -> {
+                            try(Stream<Path> folders = Files.list(path)) {
+                                return !folders.findFirst().isPresent();
+                            } catch (IOException e) {
+                                return false;
+                            }
+                        })
+                        .map(Path::toFile)
+                        .forEach(File::delete);
+            }
+
+
             log(DEBUG, "Removed: " + file);
         }