From 007f567c7a149b5cdd87cac61e7c8f572fab84df Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 5 Dec 2021 16:24:47 +0000 Subject: [PATCH] Improved directory cleanup process to avoid leaving empty parent directories lying around. --- src/main/java/org/qortal/utils/FilesystemUtils.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/qortal/utils/FilesystemUtils.java b/src/main/java/org/qortal/utils/FilesystemUtils.java index 5c3e8b38..bf558147 100644 --- a/src/main/java/org/qortal/utils/FilesystemUtils.java +++ b/src/main/java/org/qortal/utils/FilesystemUtils.java @@ -156,15 +156,8 @@ public class FilesystemUtils { } if (cleanup) { - // Delete the parent directory if it is empty (and exists in our data/temp directory) - Path parentDirectory = path.getParent(); - if (FilesystemUtils.pathInsideDataOrTempPath(parentDirectory)) { - try { - Files.deleteIfExists(parentDirectory); - } catch (IOException e) { - // This part is optional, so ignore failures - } - } + // Delete the parent directories if they are empty (and exist in our data/temp directory) + FilesystemUtils.safeDeleteEmptyParentDirectories(path); } }