Fix: correctly list the number of items to delete

ClementNerma · Jan 24, 2025 · d2ee250 · d2ee250
1 parent 03665e3
commit d2ee250
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 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 = "4.2.1"
+version = "4.2.2"
 authors = ["Clément Nerma <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/src/actions.rs b/src/actions.rs
@@ -336,7 +336,7 @@ pub fn empty(exclude_dirs: &[PathBuf]) -> Result<()> {
 
         let items = list_deletable_fs_items(trash_dir)?;
 
-        warn!("> Deleting all {} items...", items.len());
+        warn!("> Deleting {} item(s) recursively...", items.len());
 
         let pbr = ProgressBar::new(items.len().try_into().unwrap());
 

diff --git a/src/fsutils.rs b/src/fsutils.rs
@@ -485,8 +485,10 @@ pub fn are_on_same_fs(a: &Path, b: &Path) -> Result<bool> {
 
 pub fn list_deletable_fs_items(path: &Path) -> Result<Vec<PathBuf>> {
     WalkDir::new(path)
+        .min_depth(1)
         .contents_first(true)
         .into_iter()
+        .filter_entry(|entry| entry.depth() == 1 && entry.file_name() == TRASH_TRANSFER_DIRNAME)
         .map(|entry| entry.map(|entry| entry.into_path()))
         .collect::<Result<Vec<PathBuf>, _>>()
         .context("Failed to read directory entry")