From ebedd332bb58e7886ca9601e2f465106d18707fd Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 29 Jul 2024 21:47:24 +0000 Subject: [PATCH] Fix DirectoryNotEmptyException on downloads move --- .../java/io/xpipe/app/browser/BrowserTransferModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java index 85a726f4..816c6336 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java @@ -163,7 +163,12 @@ public class BrowserTransferModel { var files = toMove.stream().map(item -> item.getLocalFile()).toList(); var downloads = DesktopHelper.getDownloadsDirectory(); for (Path file : files) { - Files.move(file, downloads.resolve(file.getFileName()), StandardCopyOption.REPLACE_EXISTING); + var target = downloads.resolve(file.getFileName()); + // Prevent DirectoryNotEmptyException + if (Files.exists(target) && Files.isDirectory(target)) { + Files.delete(target); + } + Files.move(file, target, StandardCopyOption.REPLACE_EXISTING); } DesktopHelper.browseFileInDirectory(downloads.resolve(files.getFirst().getFileName())); }