Improve trash handling

ClementNerma · Dec 18, 2023 · bef4ca8 · bef4ca8
1 parent 2b0cbd7
commit bef4ca8
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 262 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trasher"
-version = "3.0.3"
+version = "3.1.0"
 authors = ["Clément Nerma <clement.nerma@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -27,3 +27,4 @@ dirs = "5.0.1"
 mountpoints = "0.2.1"
 indicatif = "0.17.7"
 fs_extra = "1.3.0"
+comfy-table = "7.1.0"
diff --git a/src/actions.rs b/src/actions.rs
@@ -14,71 +14,29 @@ use std::io::ErrorKind;
 use std::path::PathBuf;
 
 pub fn list(action: ListTrashItems) -> Result<()> {
-    let ListTrashItems { name, details } = action;
+    let ListTrashItems { name } = action;
 
     debug!("Listing trash items...");
 
-    let mut items = list_all_trash_items()?.collect::<Vec<_>>();
+    let mut items = list_all_trash_items(true)?;
+
+    if items.is_empty() {
+        println!("All trashes are empty.");
+        return Ok(());
+    }
 
     if let Some(name) = &name {
         debug!("Filtering {} items by name...", items.len());
         items.retain(|trashed| trashed.data.filename().contains(name));
-    }
-
-    items.sort_by(|a, b| a.data.datetime().cmp(b.data.datetime()));
-
-    match items.len() {
-        0 => println!(
-            "{}",
-            if name.is_some() {
-                "No item in trash match the provided name."
-            } else {
-                "Trash is empty."
-            }
-        ),
-        count => {
-            println!(
-                "Found {} item{} in trash:",
-                count,
-                if count >= 2 { "s" } else { "" }
-            );
-
-            let mut total_size = 0;
-            let mut total_dirs = 0;
-            let mut total_files = 0;
-
-            for item in items {
-                let TrashedItem { data, trash_dir } = &item;
 
-                println!(
-                    "* {data}{}",
-                    if details {
-                        let details = get_fs_details(item.complete_trash_item_path())?;
-
-                        let dir_one = if details.is_dir { 1 } else { 0 };
-
-                        total_size += details.size;
-                        total_dirs += details.sub_files + dir_one;
-                        total_files += details.sub_files + (1 - dir_one);
-
-                        format!("{}, trash dir: {}", details, trash_dir.display())
-                    } else {
-                        "".to_string()
-                    }
-                );
-            }
-
-            if details {
-                println!(
-                    "{} directories, {} files, total size is: {}",
-                    total_dirs,
-                    total_files,
-                    human_readable_size(total_size)
-                );
-            }
+        if items.is_empty() {
+            println!("No item in trash match the provided name.");
+            return Ok(());
         }
     }
 
+    println!("{}", table_for_items(&items));
+
     Ok(())
 }
 
@@ -139,14 +97,7 @@ pub fn remove(action: MoveToTrash) -> Result<()> {
             }
         };
 
-        let item_metadata = path.metadata().with_context(|| {
-            format!(
-                "Failed to get metadata for item at path '{}'",
-                path.to_string_lossy(),
-            )
-        })?;
-
-        let trash_item = TrashItem::new_now(filename.to_string(), Some(item_metadata.file_type()));
+        let trash_item = TrashItem::new_now(filename.to_string());
 
         debug!(
             "Moving item to trash under name '{}'...",
@@ -259,64 +210,50 @@ pub fn restore(action: RestoreItem) -> Result<()> {
         return restore_with_ui();
     };
 
-    match expect_trash_item(&filename, id.as_deref())? {
-        FoundTrashItems::Single(item) => {
-            let item_path = item.complete_trash_item_path();
-
-            let target_path = match to {
-                Some(to) => to,
-                None => std::env::current_dir()?,
-            };
+    let item = expect_single_trash_item(&filename, id.as_deref())?;
 
-            let target_path = target_path.join(item.data.filename());
+    let item_path = item.complete_trash_item_path();
 
-            if target_path.exists() {
-                bail!("Target path already exists.");
-            }
+    let target_path = match to {
+        Some(to) => to,
+        None => std::env::current_dir()?,
+    };
 
-            let trash_file_mountpoint = determine_mountpoint_for(&item_path)?;
-            let target_path_mountpoint = determine_mountpoint_for(&target_path)?;
+    let target_path = target_path.join(item.data.filename());
 
-            let result = if trash_file_mountpoint == target_path_mountpoint {
-                debug!("Restoring item from trash...");
+    if target_path.exists() {
+        bail!("Target path already exists.");
+    }
 
-                fs::rename(item_path, &target_path).context("Rename operation failed")
-            } else {
-                println!("Moving file across filesystems...");
+    let trash_file_mountpoint = determine_mountpoint_for(&item_path)?;
+    let target_path_mountpoint = determine_mountpoint_for(&target_path)?;
 
-                move_item_pbr(&item_path, &target_path)
-            };
+    let result = if trash_file_mountpoint == target_path_mountpoint {
+        debug!("Restoring item from trash...");
 
-            if let Err(err) = result {
-                bail!(
-                    "Failed to restore item '{}' from trash: {err:?}",
-                    item.data.filename(),
-                )
-            }
-        }
+        fs::rename(item_path, &target_path).context("Rename operation failed")
+    } else {
+        println!("Moving file across filesystems...");
 
-        FoundTrashItems::Multi(candidates) => println!(
-            "Multiple items with this filename were found in the trash:{}",
-            candidates
-                .iter()
-                .map(|trashed| format!("\n* {}", trashed.data))
-                .collect::<String>()
-        ),
-    }
+        move_item_pbr(&item_path, &target_path)
+    };
 
-    Ok(())
+    result.with_context(|| {
+        format!(
+            "Failed to restore item '{}' from trash",
+            item.data.filename()
+        )
+    })
 }
 
 pub fn restore_with_ui() -> Result<()> {
-    let mut items = list_all_trash_items()?.collect::<Vec<_>>();
+    let items = list_all_trash_items(false)?;
 
     if items.is_empty() {
         println!("Trash is empty");
         return Ok(());
     }
 
-    items.sort_by(|a, b| a.data.datetime().cmp(b.data.datetime()));
-
     let to_remove = crate::fuzzy::run_fuzzy_finder(
         items
             .into_iter()

diff --git a/src/args.rs b/src/args.rs
@@ -49,13 +49,6 @@ pub enum Action {
 pub struct ListTrashItems {
     #[clap(long, help = "Only list occurrences of items with a specific name")]
     pub name: Option<String>,
-
-    #[clap(
-        short,
-        long,
-        help = "Show details (size, number of files and directories)"
-    )]
-    pub details: bool,
 }
 
 #[derive(Parser)]