Skip output file when it exists within the input path

Systemcluster · Nov 21, 2023 · 7bca05c · 7bca05c
1 parent bf48339
commit 7bca05c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/compress.rs b/src/compress.rs
@@ -66,14 +66,16 @@ pub fn copy_encode<R: Read, W: Write>(
 pub fn compress<
     T: AsRef<Path>,
     W: Write + Seek + Sync + Send,
+    X: AsRef<Path>,
     P: Fn() + Sync + Send,
     E: Fn(&str) + Sync + Send,
     I: Fn(&str) + Sync + Send,
 >(
-    source: T, target: &mut W, compression: u32, progress_callback: P, error_callback: E,
-    info_callback: I,
+    source: T, target: &mut W, exclude: X, compression: u32, progress_callback: P,
+    error_callback: E, info_callback: I,
 ) -> (u64, u64, u64) {
     let source: &Path = source.as_ref();
+    let exclude: &Path = exclude.as_ref();
 
     let num_cpus = num_cpus::get() as u64;
     let system = System::new_with_specifics(sysinfo::RefreshKind::new().with_memory());
@@ -112,6 +114,10 @@ pub fn compress<
                 return None;
             }
             let entry = entry.path();
+            if entry == exclude {
+                error_callback(&format!("skipping excluded file: {}", entry.display()));
+                return None;
+            }
             let entry = entry.strip_prefix(source).ok()?;
 
             if entry.file_name()?.len() > NAME_SIZE {
@@ -170,6 +176,10 @@ pub fn compress<
                 return None;
             }
             let entry = entry.path();
+            if entry == exclude {
+                error_callback(&format!("skipping excluded file: {}", entry.display()));
+                return None;
+            }
 
             if entry.file_name()?.len() > NAME_SIZE {
                 error_callback(&format!(
@@ -359,6 +369,10 @@ pub fn compress<
                 return None;
             }
             let entry = entry.path();
+            if entry == exclude {
+                error_callback(&format!("skipping excluded file: {}", entry.display()));
+                return None;
+            }
 
             if entry.file_name()?.len() > NAME_SIZE {
                 error_callback(&format!(

diff --git a/src/main.rs b/src/main.rs
@@ -100,6 +100,14 @@ fn main() {
 
     let mut show_console = get_show_console(&args.console, runner_name);
 
+    if output == source {
+        println!(
+            "{}: {}",
+            style("output file can't be the input file").red(),
+            output.display()
+        );
+        std::process::exit(-1);
+    }
     let file = File::create(&output).unwrap_or_else(|_| {
         println!(
             "{}: {}",
@@ -226,13 +234,14 @@ fn main() {
     let (compressed, read, written) = compress(
         &source,
         &mut writer,
+        &output,
         args.compression,
         || {
             bar_progress.inc(1);
         },
         |message| {
             bar_progress.inc(1);
-            bar_progress.println(format!("      {}{}", Emoji("⚠ ", ""), style(message).red()));
+            bar_progress.println(format!("      {}{}", Emoji("⚠️ ", ""), style(message).red()));
         },
         |message| {
             bar_progress.set_message(format!("{}", style(message).blue().bright()));
@@ -304,7 +313,7 @@ fn main() {
         set_permissions(&output, PermissionsExt::from_mode(mode | 0o111)).unwrap_or_else(|e| {
             eprintln!(
                 "      {} failed to set permissions for {}: {}",
-                Emoji("⚠ ", ""),
+                Emoji("⚠️ ", ""),
                 output.display(),
                 e
             )