refactor(main): simplify suffix handling and add overwrite flag

cauliyang · Nov 7, 2023 · e9cc401 · e9cc401
1 parent 5ad06f6
commit e9cc401
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 70 deletions.
diff --git a/README.md b/README.md
diff --git a/src/main.rs b/src/main.rs
@@ -78,8 +78,12 @@ enum Commands {
         target: Option<PathBuf>,
 
         /// The suffix of the files to link. default is all files
-        #[arg(short = 's')]
-        suffix: Option<String>,
+        #[arg(short = 's', value_delimiter = ' ', num_args=1..)]
+        suffix: Option<Vec<String>>,
+
+        /// Overwrite existing files
+        #[arg(short = 'o', default_value = "false")]
+        overwrite: bool,
     },
 }
 
@@ -144,9 +148,10 @@ fn main() {
             source,
             target,
             suffix,
+            overwrite,
         }) => {
             info!("'rsoft'  {target:?} {suffix:?} ");
-            rsoft::rsoft(source, target.as_ref(), suffix.clone()).unwrap();
+            rsoft::rsoft(source, target.as_ref(), suffix.clone(), *overwrite).unwrap();
         }
 
         // If no subcommand was used, it's a normal top level command

diff --git a/src/rsoft.rs b/src/rsoft.rs
@@ -14,31 +14,43 @@ use std::os::windows::fs as windows_fs;
 pub fn rsoft<P: AsRef<Path>>(
     source_directory: P,
     target_directory: Option<P>,
-    suffix: Option<String>,
+    suffix: Option<Vec<String>>,
+    overwrite: bool,
 ) -> Result<()> {
     let pattern = if suffix.is_some() {
-        format!(r".*\.{}", suffix.unwrap())
+        let suffix_re = suffix
+            .unwrap()
+            .iter()
+            .map(|s| regex::escape(s))
+            .collect::<Vec<_>>()
+            .join("|");
+
+        format!(r".*\.({})$", suffix_re)
     } else {
         ".*".to_string()
     };
 
     let re = Regex::new(&pattern).unwrap();
 
-    let mut current_directory = env::current_dir().unwrap();
+    let mut target_dir = env::current_dir().unwrap();
     if target_directory.is_some() {
-        current_directory = target_directory.unwrap().as_ref().to_path_buf();
+        target_dir = target_directory.unwrap().as_ref().to_path_buf();
     }
 
-    for entry in WalkDir::new(source_directory)
+    // make target dir become absolute
+    target_dir = target_dir.canonicalize()?;
+    let source_dir = source_directory.as_ref().canonicalize()?;
+
+    for entry in WalkDir::new(source_dir)
         .into_iter()
         .filter_map(|e| e.ok())
         .filter(|e| e.path().is_file() && re.is_match(&e.path().to_string_lossy()))
     {
         let path = entry.path();
 
-        let link_name = current_directory.join(path.file_name().unwrap());
+        let link_name = target_dir.join(path.file_name().unwrap());
 
-        if !link_name.exists() {
+        if !link_name.exists() || overwrite {
             #[cfg(unix)]
             {
                 if let Err(e) = unix_fs::symlink(path, &link_name) {