Fix: create partial trash directory if needed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trasher"
-version = "3.1.5"
+version = "3.1.6"
 authors = ["Clément Nerma <clement.nerma@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"

src/actions.rs

@@ -117,11 +117,15 @@ pub fn remove(action: MoveToTrash) -> Result<()> {
                     trash_dir.display()
                 )
             })?;
+        }
+
+        let trash_transfer_dir = trash_dir.join(TRASH_TRANSFER_DIRNAME);
 
-            fs::create_dir(&trash_dir.join(TRASH_TRANSFER_DIRNAME)).with_context(|| {
+        if !trash_transfer_dir.exists() {
+            fs::create_dir(&trash_transfer_dir).with_context(|| {
                 format!(
                     "Failed to create trash's partial transfer directory at path '{}'",
-                    trash_dir.join(TRASH_TRANSFER_DIRNAME).display()
+                    trash_transfer_dir.display()
                 )
             })?;
         }
@@ -136,18 +140,12 @@ pub fn remove(action: MoveToTrash) -> Result<()> {
         fs::rename(&path, &trash_item_path)
             .with_context(|| format!("Failed to move item '{}' to trash", path.display()))?;
 
-        for i in 1..=3 {
-            if let Err(err) = move_transferred_trash_item(&trash_item) {
-                debug!(
-                    "Failed to rename transferred item in trash (try n°{}): {}",
-                    i, err
-                );
-
-                if i == 3 {
-                    bail!("Failed to move item '{}' to trash: {err:?}", path.display());
-                }
-            }
-        }
+        fs::rename(&trash_item_path, trash_item.complete_trash_item_path()).with_context(|| {
+            format!(
+                "Failed to move fully transferred item '{}' to trash",
+                path.display()
+            )
+        })?;
     }
 
     Ok(())

src/fsutils.rs

@@ -198,16 +198,6 @@ pub fn expect_single_trash_item(filename: &str, id: Option<&str>) -> Result<Tras
     }
 }
 
-/// Move a partial item to the trash's main directory once the transfer is complete
-pub fn move_transferred_trash_item(item: &TrashedItem) -> Result<()> {
-    fs::rename(
-        item.transfer_trash_item_path(),
-        item.complete_trash_item_path(),
-    )?;
-
-    Ok(())
-}
-
 /// Convert a size in bytes to a human-readable size
 pub fn human_readable_size(bytes: u64) -> String {
     let names = ["KiB", "MiB", "GiB", "TiB", "PiB", "EiB"];