From c38962ef2ea5ff719aa08caa102f7ac379626087 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 11 Sep 2024 22:31:28 +0000
Subject: [PATCH] Fix downloads move being unreliable

---
 .../java/io/xpipe/app/browser/BrowserTransferModel.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 5f7b5229..a2ce2b02 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java
@@ -10,21 +10,18 @@ import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.util.DesktopHelper;
 import io.xpipe.app.util.ShellTemp;
 import io.xpipe.app.util.ThreadHelper;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import lombok.Value;
 import org.apache.commons.io.FileUtils;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -162,13 +159,14 @@ public class BrowserTransferModel {
 
         var files = toMove.stream().map(item -> item.getLocalFile()).toList();
         var downloads = DesktopHelper.getDownloadsDirectory();
+        Files.createDirectories(downloads);
         for (Path file : files) {
             var target = downloads.resolve(file.getFileName());
             // Prevent DirectoryNotEmptyException
             if (Files.exists(target) && Files.isDirectory(target)) {
                 FileUtils.deleteDirectory(target.toFile());
             }
-            Files.move(file, target, StandardCopyOption.REPLACE_EXISTING);
+            FileUtils.moveDirectory(file.toFile(),target.toFile());
         }
         DesktopHelper.browseFileInDirectory(downloads.resolve(files.getFirst().getFileName()));
     }