fix: clear temp root dir instead delete (#2312)

skylot · Oct 22, 2024 · 3d5e225 · 3d5e225
1 parent 8a34d97
commit 3d5e225
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/jadx-core/src/main/java/jadx/api/JadxDecompiler.java b/jadx-core/src/main/java/jadx/api/JadxDecompiler.java
@@ -178,7 +178,7 @@ public void close() {
 		closeInputs();
 		closeLoaders();
 		args.close();
-		FileUtils.deleteTempRootDir();
+		FileUtils.clearTempRootDir();
 	}
 
 	private void closeInputs() {

diff --git a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java b/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
@@ -152,7 +152,7 @@ public static void deleteDirIfExists(Path dir) {
 		}
 	}
 
-	private static final SimpleFileVisitor<Path> FILE_DELETE_VISITOR = new SimpleFileVisitor<Path>() {
+	private static final SimpleFileVisitor<Path> FILE_DELETE_VISITOR = new SimpleFileVisitor<>() {
 		@Override
 		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
 			Files.delete(file);
@@ -174,8 +174,30 @@ private static void deleteDir(Path dir) {
 		}
 	}
 
-	public static void deleteTempRootDir() {
-		deleteDirIfExists(tempRootDir);
+	public static void clearTempRootDir() {
+		clearDir(tempRootDir);
+	}
+
+	public static void clearDir(Path clearDir) {
+		try {
+			Files.walkFileTree(clearDir, Collections.emptySet(), Integer.MAX_VALUE, new SimpleFileVisitor<>() {
+				@Override
+				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+					Files.delete(file);
+					return FileVisitResult.CONTINUE;
+				}
+
+				@Override
+				public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+					if (!dir.equals(clearDir)) {
+						Files.delete(dir);
+					}
+					return FileVisitResult.CONTINUE;
+				}
+			});
+		} catch (Exception e) {
+			throw new JadxRuntimeException("Failed to clear directory " + clearDir, e);
+		}
 	}
 
 	public static Path createTempDir(String prefix) {