♻️ use OutputOption to extract_entry argument to simplify code

ChanTsune · Aug 24, 2024 · 940a55d · 940a55d
1 parent 64a64c8
commit 940a55d
Showing 1 changed file with 10 additions and 25 deletions.
diff --git a/cli/src/command/extract.rs b/cli/src/command/extract.rs
@@ -167,19 +167,10 @@ where
         }
         let tx = tx.clone();
         let password = password.clone();
-        let out_dir = args.out_dir.clone();
-        let owner_options = args.owner_options.clone();
+        let options = args.clone();
         pool.spawn_fifo(move || {
-            tx.send(extract_entry(
-                item,
-                password,
-                args.overwrite,
-                out_dir.as_deref(),
-                args.keep_options,
-                owner_options,
-                verbosity,
-            ))
-            .unwrap_or_else(|e| panic!("{e}: {}", item_path));
+            tx.send(extract_entry(item, password, options, verbosity))
+                .unwrap_or_else(|e| panic!("{e}: {}", item_path));
         });
         Ok(())
     })?;
@@ -189,26 +180,20 @@ where
     }
 
     for item in hard_link_entries {
-        extract_entry(
-            item,
-            password.clone(),
-            args.overwrite,
-            args.out_dir.as_deref(),
-            args.keep_options,
-            args.owner_options.clone(),
-            verbosity,
-        )?;
+        extract_entry(item, password.clone(), args.clone(), verbosity)?;
     }
     Ok(())
 }
 
 pub(crate) fn extract_entry(
     item: RegularEntry,
     password: Option<String>,
-    overwrite: bool,
-    out_dir: Option<&Path>,
-    keep_options: KeepOptions,
-    owner_options: OwnerOptions,
+    OutputOption {
+        overwrite,
+        out_dir,
+        keep_options,
+        owner_options,
+    }: OutputOption,
     verbosity: Verbosity,
 ) -> io::Result<()> {
     let item_path = item.header().path().as_path();