better args order, fmt

ouch-org · Dec 19, 2022 · 0ceb84d · 0ceb84d
1 parent e26323b
commit 0ceb84d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/src/archive/tar.rs b/src/archive/tar.rs
@@ -45,7 +45,7 @@ pub fn unpack_archive(reader: Box<dyn Read>, output_folder: &Path, quiet: bool)
                 format_size(file.size(), DECIMAL),
             );
 
-        files_unpacked.push(file_path);
+            files_unpacked.push(file_path);
         }
     }
 
@@ -86,8 +86,8 @@ pub fn build_archive_from_paths<W>(
     input_filenames: &[PathBuf],
     output_path: &Path,
     writer: W,
-    quiet: bool,
     file_visibility_policy: FileVisibilityPolicy,
+    quiet: bool,
 ) -> crate::Result<W>
 where
     W: Write,

diff --git a/src/archive/zip.rs b/src/archive/zip.rs
@@ -138,8 +138,8 @@ pub fn build_archive_from_paths<W>(
     input_filenames: &[PathBuf],
     output_path: &Path,
     writer: W,
-    quiet: bool,
     file_visibility_policy: FileVisibilityPolicy,
+    quiet: bool,
 ) -> crate::Result<W>
 where
     W: Write + Seek,

diff --git a/src/commands/compress.rs b/src/commands/compress.rs
@@ -75,7 +75,7 @@ pub fn compress_files(
             io::copy(&mut reader, &mut writer)?;
         }
         Tar => {
-            archive::tar::build_archive_from_paths(&files, output_path, &mut writer, quiet, file_visibility_policy)?;
+            archive::tar::build_archive_from_paths(&files, output_path, &mut writer, file_visibility_policy, quiet)?;
             writer.flush()?;
         }
         Zip => {
@@ -89,7 +89,13 @@ pub fn compress_files(
 
             let mut vec_buffer = Cursor::new(vec![]);
 
-            archive::zip::build_archive_from_paths(&files, output_path, &mut vec_buffer, quiet, file_visibility_policy)?;
+            archive::zip::build_archive_from_paths(
+                &files,
+                output_path,
+                &mut vec_buffer,
+                file_visibility_policy,
+                quiet,
+            )?;
             vec_buffer.rewind()?;
             io::copy(&mut vec_buffer, &mut writer)?;
         }

diff --git a/src/commands/decompress.rs b/src/commands/decompress.rs
@@ -30,7 +30,7 @@ pub fn decompress_file(
     output_dir: &Path,
     output_file_path: PathBuf,
     question_policy: QuestionPolicy,
-    quiet: bool
+    quiet: bool,
 ) -> crate::Result<()> {
     assert!(output_dir.exists());
     let reader = fs::File::open(input_file_path)?;

diff --git a/src/commands/mod.rs b/src/commands/mod.rs
@@ -245,7 +245,14 @@ pub fn run(
 
             for ((input_path, formats), file_name) in files.iter().zip(formats).zip(output_paths) {
                 let output_file_path = output_dir.join(file_name); // Path used by single file format archives
-                decompress_file(input_path, formats, &output_dir, output_file_path, question_policy, args.quiet)?;
+                decompress_file(
+                    input_path,
+                    formats,
+                    &output_dir,
+                    output_file_path,
+                    question_policy,
+                    args.quiet,
+                )?;
             }
         }
         Subcommand::List { archives: files, tree } => {