github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 20:15:27 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

better args order, fmt

Browse Source
This commit is contained in:
a-moreira 2022-12-18 22:56:13 -03:00
parent e26323bd99
commit 0ceb84d5cf
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/archive/tar.rs
View File

@ -86,8 +86,8 @@ pub fn build_archive_from_paths<W>(
input_filenames: &[PathBuf], input_filenames: &[PathBuf],
output_path: &Path, output_path: &Path,
writer: W, writer: W,
quiet: bool,
file_visibility_policy: FileVisibilityPolicy, file_visibility_policy: FileVisibilityPolicy,
quiet: bool,
) -> crate::Result<W> ) -> crate::Result<W>
where where
W: Write, W: Write,

2
src/archive/zip.rs
View File

@ -138,8 +138,8 @@ pub fn build_archive_from_paths<W>(
input_filenames: &[PathBuf], input_filenames: &[PathBuf],
output_path: &Path, output_path: &Path,
writer: W, writer: W,
quiet: bool,
file_visibility_policy: FileVisibilityPolicy, file_visibility_policy: FileVisibilityPolicy,
quiet: bool,
) -> crate::Result<W> ) -> crate::Result<W>
where where
W: Write + Seek, W: Write + Seek,

10
src/commands/compress.rs
View File

@ -75,7 +75,7 @@ pub fn compress_files(
io::copy(&mut reader, &mut writer)?; io::copy(&mut reader, &mut writer)?;
} }
Tar => { 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()?; writer.flush()?;
} }
Zip => { Zip => {
@ -89,7 +89,13 @@ pub fn compress_files(
let mut vec_buffer = Cursor::new(vec![]); 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()?; vec_buffer.rewind()?;
io::copy(&mut vec_buffer, &mut writer)?; io::copy(&mut vec_buffer, &mut writer)?;
} }

2
src/commands/decompress.rs
View File

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

9
src/commands/mod.rs
View File

@ -245,7 +245,14 @@ pub fn run(
for ((input_path, formats), file_name) in files.iter().zip(formats).zip(output_paths) { 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 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 } => { Subcommand::List { archives: files, tree } => {