Merge pull request #5 from santoshxshrestha/multiple_files

feat: multiple files as args in purge/recover
refactor: removed some old fn

Author: vimlinuz

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.1.7] -
+## [0.1.7] - 2025-08-31
 
 ### Added
 
@@ -19,9 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - update README with new changes
+- improved code structure and organization
+- `recover` command will now can take multiple file names as args
+- `purge` command will now can take multiple file names as args
 
 ### Fixed
 
+- minor bug fixes and improvements
+
 ## [0.1.6] - 2025-08-30
 
 ### Added

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rmxt"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2024"
 authors = ["Santosh Shrestha <santoshxshrestha@gmail.com> "]
 description = "A replacement for the 'rm' command with a trash feature for safer file deletion."

Cargo.toml

@@ -59,15 +59,15 @@ pub enum Commands {
     Recover {
         /// Name of the file to recover
         #[arg(help = "Name of the file to recover from trash")]
-        name: String,
+        name: Vec<String>,
     },
 
     /// Purge files from the trash directory
     #[command(name = "purge")]
     Purge {
         /// Purge files from the trash directory
         #[arg(help = "Name of the file to purge")]
-        name: String,
+        name: Vec<String>,
     },
 }
 
@@ -101,10 +101,10 @@ impl Args {
     }
 
     /// Get the name to recover (if recover command is active)
-    pub fn get_recover_name(&self) -> Option<&str> {
+    pub fn get_recover_name(&self) -> Vec<String> {
         match &self.command {
-            Some(Commands::Recover { name }) => Some(name),
-            _ => None,
+            Some(Commands::Recover { name }) => name.clone(),
+            _ => Vec::new(),
         }
     }
 
@@ -114,10 +114,10 @@ impl Args {
     }
 
     /// Get the name to purge (if purge command is active)
-    pub fn get_purge_name(&self) -> Option<&str> {
+    pub fn get_purge_name(&self) -> Vec<String> {
         match &self.command {
-            Some(Commands::Purge { name }) => Some(name),
-            _ => None,
+            Some(Commands::Purge { name }) => name.clone(),
+            _ => Vec::new(),
         }
     }
 

src/args.rs

@@ -11,28 +11,6 @@ use std::{fs, result};
 use trash::os_limited::{self, purge_all, restore_all};
 use trash::{TrashItem, delete};
 
-pub fn recover_from_trash(name: &str) -> Result<(), Box<dyn std::error::Error>> {
-    let list = trash::os_limited::list()?;
-    let items_to_restore: Vec<_> = list.into_iter().filter(|item| item.name == name).collect();
-
-    if !items_to_restore.is_empty() {
-        restore_all(items_to_restore)?;
-        println!("Recovered '{name}'");
-    } else {
-        println!("No items found to recover with the name '{name}'");
-    }
-    Ok(())
-}
-
-pub fn purge(name: &str) -> Result<(), trash::Error> {
-    let content_to_remove: Vec<TrashItem> = trash::os_limited::list()
-        .unwrap()
-        .into_iter()
-        .filter(|content| content.name == name)
-        .collect();
-    purge_all(content_to_remove)
-}
-
 pub fn list_specific_trash(seconds: i64) {
     let entries = trash::os_limited::list().unwrap();
     let now = Local::now().timestamp();
@@ -77,17 +55,22 @@ pub fn list_trash() {
     }
 }
 
-pub fn tidy_trash(days: i64) -> Result<(), Box<dyn Error>> {
+pub fn tidy_trash(days: i64) {
     let seconds: i64 = days * 86400;
-    let entries = trash::os_limited::list()?;
     let now = Local::now().timestamp();
-    for entry in entries {
-        if now - entry.time_deleted > seconds {
-            purge(&entry.name.to_string_lossy())?;
-            println!("Purged: {}", entry.name.to_string_lossy());
+    let content_to_purge = trash::os_limited::list()
+        .unwrap()
+        .into_iter()
+        .filter(|item| item.time_deleted < seconds)
+        .collect::<Vec<TrashItem>>();
+
+    if !content_to_purge.is_empty() {
+        if let Err(e) = trash::os_limited::purge_all(content_to_purge) {
+            eprintln!("Error purging items: {e}");
+        } else {
+            println!("No items found to purge older than {days} days");
         }
     }
-    Ok(())
 }
 
 fn main() {
@@ -101,10 +84,19 @@ fn main() {
     let ignore = args.ignore;
 
     if args.is_purge() {
-        if let Some(filename) = args.get_purge_name() {
-            if let Err(e) = purge(filename) {
-                eprintln!("Error removing the content from the bin: {e}")
+        let names = args.get_purge_name();
+        let content_to_purge = trash::os_limited::list()
+            .unwrap()
+            .into_iter()
+            .filter(|item| names.contains(&item.name.to_string_lossy().to_string()))
+            .collect::<Vec<TrashItem>>();
+
+        if !content_to_purge.is_empty() {
+            if let Err(e) = trash::os_limited::purge_all(content_to_purge) {
+                eprintln!("Error purging items: {e}");
             }
+        } else {
+            println!("No items found to purge with such names");
         }
     }
 
@@ -133,15 +125,25 @@ fn main() {
             return;
         } else {
             list_specific_trash(seconds);
+            return;
         }
+        return;
     }
 
     // recovering files from trash if the recover command is used
     if args.is_recover() {
-        if let Some(name) = args.get_recover_name() {
-            if let Err(e) = recover_from_trash(name) {
-                eprintln!("Error recovering from trash: {e}");
+        let names = args.get_recover_name();
+        let content_to_recover = trash::os_limited::list()
+            .unwrap()
+            .into_iter()
+            .filter(|item| names.contains(&item.name.to_string_lossy().to_string()))
+            .collect::<Vec<TrashItem>>();
+        if !content_to_recover.is_empty() {
+            if let Err(e) = trash::os_limited::restore_all(content_to_recover) {
+                eprintln!("Error recovering items: {e}");
             }
+        } else {
+            println!("No items found to recover with such names");
         }
         return;
     }
@@ -163,9 +165,7 @@ fn main() {
             return;
         }
 
-        if let Err(e) = tidy_trash(days) {
-            eprintln!("Error tidying the trash: {e}");
-        }
+        tidy_trash(days);
         return;
     }