crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fixed bugs in safeDeleteEmptyParentDirectories()

Browse Source
This commit is contained in:
CalDescent 2021-12-01 11:59:14 +00:00
parent b7ee00fb22
commit 97cdd53861
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/qortal/utils/FilesystemUtils.java
View File

@ -169,16 +169,22 @@ public class FilesystemUtils {
} }
public static void safeDeleteEmptyParentDirectories(Path path) throws IOException { public static void safeDeleteEmptyParentDirectories(Path path) throws IOException {
final Path absolutePath = path.toAbsolutePath(); final Path parentPath = path.toAbsolutePath().getParent();
if (!absolutePath.toFile().isDirectory()) { if (!parentPath.toFile().isDirectory()) {
return; return;
} }
if (!FilesystemUtils.pathInsideDataOrTempPath(absolutePath)) { if (!FilesystemUtils.pathInsideDataOrTempPath(parentPath)) {
return; return;
} }
Files.deleteIfExists(absolutePath); try {
Files.deleteIfExists(parentPath);
FilesystemUtils.safeDeleteEmptyParentDirectories(absolutePath.getParent()); } catch (DirectoryNotEmptyException e) {
// We've reached the limits of what we can delete
return;
}
FilesystemUtils.safeDeleteEmptyParentDirectories(parentPath);
} }
public static boolean pathInsideDataOrTempPath(Path path) { public static boolean pathInsideDataOrTempPath(Path path) {