Use homemade recursive directory copy

Author: Moulberry

Cargo.lock

@@ -110,7 +110,6 @@ minisign-verify = "0.2.4"
 tar = "0.4.44"
 runas = "1.2.0"
 rusqlite = { version = "0.38.0", features = ["bundled"] }
-fs_extra = "1.3.0"
 walkdir = "2.5.0"
 urlencoding = "2.1.3"
 windows = { version = "0.62.2", features = ["Win32_Foundation", "Win32_System_Registry", "Win32_System_Com", "Win32_System_Threading", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging", "Wdk_System_SystemServices", "Win32_System_SystemInformation", "Win32_Security_Credentials"] }

Cargo.toml

@@ -57,7 +57,6 @@ tar.workspace = true
 runas.workspace = true
 directories.workspace = true
 rusqlite.workspace = true
-fs_extra.workspace = true
 walkdir.workspace = true
 url.workspace = true
 crc32fast.workspace = true

crates/backend/Cargo.toml

@@ -440,13 +440,11 @@ fn import_instances_from_atlauncher(backend: &BackendState, import_job: &ImportF
         _ = std::fs::create_dir_all(&to_import.pandora_path);
         let target_dot_minecraft = to_import.pandora_path.join(".minecraft");
 
-        let copy_options = fs_extra::dir::CopyOptions::default().copy_inside(true);
-        _ = fs_extra::dir::copy_with_progress(to_import.folder, &target_dot_minecraft, &copy_options, |state| {
-            tracker.set_total(state.total_bytes as usize);
-            tracker.set_count(state.copied_bytes as usize);
+        _ = std::fs::create_dir_all(&target_dot_minecraft);
+        _ = crate::copy_content_recursive(&to_import.folder, &target_dot_minecraft, false, &|copied, total| {
+            tracker.set_total(total as usize);
+            tracker.set_count(copied as usize);
             tracker.notify();
-
-            fs_extra::dir::TransitProcessResult::ContinueOrAbort
         });
 
         // remove old configuration, rename icon path.
@@ -464,7 +462,7 @@ fn import_instances_from_atlauncher(backend: &BackendState, import_job: &ImportF
             _ = std::fs::create_dir(&resourcepacks_path);
 
             for mod_file in disabled_mods_folder{
-                let Ok(entry) = mod_file else{
+                let Ok(entry) = mod_file else {
                     continue;
                 };
 

crates/backend/src/launcher_import/atlauncher.rs

@@ -98,12 +98,12 @@ pub fn import_instances_from_modrinth(backend: &BackendState, import_job: Import
 
         // Copy .minecraft folder
         let target_dot_minecraft = to_import.pandora_path.join(".minecraft");
-        let copy_options = fs_extra::dir::CopyOptions::default().copy_inside(true);
-        _ = fs_extra::dir::copy_with_progress(to_import.minecraft_folder, target_dot_minecraft, &copy_options, |state| {
-            tracker.set_total(state.total_bytes as usize);
-            tracker.set_count(state.copied_bytes as usize);
+
+        _ = std::fs::create_dir_all(&target_dot_minecraft);
+        _ = crate::copy_content_recursive(&to_import.minecraft_folder, &target_dot_minecraft, false, &|copied, total| {
+            tracker.set_total(total as usize);
+            tracker.set_count(copied as usize);
             tracker.notify();
-            fs_extra::dir::TransitProcessResult::ContinueOrAbort
         });
 
         // Copy icon

crates/backend/src/launcher_import/modrinth.rs

@@ -456,20 +456,19 @@ fn import_instances_from_multimc(backend: &BackendState, import_job: &ImportFrom
         let mmc_dot_minecraft = to_import.folder.join(".minecraft");
         let mmc_minecraft = to_import.folder.join("minecraft");
         let target_dot_minecraft = to_import.pandora_path.join(".minecraft");
-        let copy_options = fs_extra::dir::CopyOptions::default().copy_inside(true);
         if mmc_minecraft.exists() {
-            _ = fs_extra::dir::copy_with_progress(mmc_minecraft, target_dot_minecraft, &copy_options, |state| {
-                tracker.set_total(state.total_bytes as usize);
-                tracker.set_count(state.copied_bytes as usize);
+            _ = std::fs::create_dir_all(&target_dot_minecraft);
+            _ = crate::copy_content_recursive(&mmc_minecraft, &target_dot_minecraft, false, &|copied, total| {
+                tracker.set_total(total as usize);
+                tracker.set_count(copied as usize);
                 tracker.notify();
-                fs_extra::dir::TransitProcessResult::ContinueOrAbort
             });
         } else if mmc_dot_minecraft.exists() {
-            _ = fs_extra::dir::copy_with_progress(mmc_dot_minecraft, target_dot_minecraft, &copy_options, |state| {
-                tracker.set_total(state.total_bytes as usize);
-                tracker.set_count(state.copied_bytes as usize);
+            _ = std::fs::create_dir_all(&target_dot_minecraft);
+            _ = crate::copy_content_recursive(&mmc_dot_minecraft, &target_dot_minecraft, false, &|copied, total| {
+                tracker.set_total(total as usize);
+                tracker.set_count(copied as usize);
                 tracker.notify();
-                fs_extra::dir::TransitProcessResult::ContinueOrAbort
             });
         }
 

crates/backend/src/launcher_import/multimc.rs

@@ -198,7 +198,7 @@ impl FolderChanges {
     }
 }
 
-pub fn copy_content_recursive(from: &Path, to: &Path) -> std::io::Result<()> {
+pub fn copy_content_recursive(from: &Path, to: &Path, strict: bool, progress: &dyn Fn(u64, u64)) -> std::io::Result<()> {
     let from = from.canonicalize()?;
     if !from.is_dir() {
         return Err(ErrorKind::NotADirectory.into());
@@ -262,38 +262,53 @@ pub fn copy_content_recursive(from: &Path, to: &Path) -> std::io::Result<()> {
             }
         }
     }
+    (progress)(0, total_bytes);
 
     for directory in directories {
         _ = std::fs::create_dir(to.join(directory));
     }
     let mut copied_bytes = 0;
     for (relative, copy_from) in files {
         let dest = to.join(relative);
-        copied_bytes += std::fs::copy(copy_from, dest)?;
+        match std::fs::copy(copy_from, dest) {
+            Ok(bytes) => copied_bytes += bytes,
+            Err(err) => if strict {
+                return Err(err);
+            },
+        }
+        (progress)(copied_bytes, total_bytes);
     }
-    if copied_bytes != total_bytes {
+    if strict && copied_bytes != total_bytes {
         return Err(Error::new(ErrorKind::Other,
             format!("Expected copy size did not match. Expected to copy {total_bytes} bytes, copied {copied_bytes} instead")));
     }
     for (relative, internal) in internal_symlinks {
         let dest = to.join(relative);
         let target = to.join(internal);
-        symlink_dir_or_file(&target, &dest)?;
+        if let Err(err) = symlink_dir_or_file(&target, &dest) && strict {
+            return Err(err);
+        }
     }
     for (relative, target) in external_symlinks {
         let dest = to.join(relative);
-        symlink_dir_or_file(&target, &dest)?;
+        if let Err(err) = symlink_dir_or_file(&target, &dest) && strict {
+            return Err(err);
+        }
     }
     #[cfg(windows)]
     for (relative, internal) in internal_junctions {
         let dest = to.join(relative);
         let target = to.join(internal);
-        junction::create(&target, &dest)?;
+        if let Err(err) = junction::create(&target, &dest) && strict {
+            return Err(err);
+        }
     }
     #[cfg(windows)]
     for (relative, target) in external_junctions {
         let dest = to.join(relative);
-        junction::create(&target, &dest)?;
+        if let Err(err) = junction::create(&target, &dest) && strict {
+            return Err(err);
+        }
     }
     Ok(())
 }
@@ -335,7 +350,7 @@ pub fn rename_with_fallback_across_devices(from: &Path, to: &Path) -> std::io::R
                 _ = std::fs::remove_file(from);
             } else if from.is_dir() {
                 std::fs::create_dir(to)?;
-                if let Err(err) = copy_content_recursive(from, to) {
+                if let Err(err) = copy_content_recursive(from, to, true, &|_, _| {}) {
                     _ = std::fs::remove_dir_all(to);
                     return Err(err);
                 } else {