Use fs::copy() if fs::rename() fails

Zireael-N · Jul 18, 2020 · 762e743 · 762e743
1 parent 68816f7
commit 762e743
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/localize_npc_names/Cargo.toml b/localize_npc_names/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "localize_npc_names"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Velithris"]
 edition = "2018"
 

diff --git a/localize_npc_names/src/utils.rs b/localize_npc_names/src/utils.rs
@@ -212,9 +212,15 @@ pub(crate) fn write_to_dir(
                 tmp_file.flush().map_err(|e| (tmp_path.clone(), e))?;
 
                 drop(to_file);
-                if let Err(e) = fs::rename(&tmp_path, &to_path) {
+
+                // Fails if files belong to different filesystems
+                if let Err(_) = fs::rename(&tmp_path, &to_path) {
+                    let copy_result = fs::copy(&tmp_path, &to_path);
                     fs::remove_file(&tmp_path).map_err(|e| (tmp_path, e))?;
-                    return Err((to_path, e));
+
+                    if let Err(e) = copy_result {
+                        return Err((to_path, e));
+                    }
                 }
             }
         }