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

style: cargo fmt with nightly version

Browse Source
This commit is contained in:
ttyS3 2024-11-30 16:28:16 +00:00 committed by João Marcos
parent 62f3d78f44
commit 353c360f6f
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/commands/decompress.rs
View File

@ -162,7 +162,11 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
let _locks = lock_and_flush_output_stdio(); let _locks = lock_and_flush_output_stdio();
warn_user_about_loading_zip_in_memory(); warn_user_about_loading_zip_in_memory();
if !user_wants_to_continue(options.input_file_path, options.question_policy, QuestionAction::Decompression)? { if !user_wants_to_continue(
options.input_file_path,
options.question_policy,
QuestionAction::Decompression,
)? {
return Ok(()); return Ok(());
} }
} }
@ -172,7 +176,9 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
let zip_archive = zip::ZipArchive::new(io::Cursor::new(vec))?; let zip_archive = zip::ZipArchive::new(io::Cursor::new(vec))?;
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = smart_unpack(
|output_dir| crate::archive::zip::unpack_archive(zip_archive, output_dir, options.password, options.quiet), |output_dir| {
crate::archive::zip::unpack_archive(zip_archive, output_dir, options.password, options.quiet)
},
options.output_dir, options.output_dir,
&options.output_file_path, &options.output_file_path,
options.question_policy, options.question_policy,
@ -192,12 +198,22 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
crate::archive::rar::unpack_archive(temp_file.path(), output_dir, options.password, options.quiet) crate::archive::rar::unpack_archive(temp_file.path(), output_dir, options.password, options.quiet)
}) })
} else { } else {
Box::new(|output_dir| crate::archive::rar::unpack_archive(options.input_file_path, output_dir, options.password, options.quiet)) Box::new(|output_dir| {
crate::archive::rar::unpack_archive(
options.input_file_path,
output_dir,
options.password,
options.quiet,
)
})
}; };
if let ControlFlow::Continue(files) = if let ControlFlow::Continue(files) = smart_unpack(
smart_unpack(unpack_fn, options.output_dir, &options.output_file_path, options.question_policy)? unpack_fn,
{ options.output_dir,
&options.output_file_path,
options.question_policy,
)? {
files files
} else { } else {
return Ok(()); return Ok(());
@ -214,7 +230,11 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
let _locks = lock_and_flush_output_stdio(); let _locks = lock_and_flush_output_stdio();
warn_user_about_loading_sevenz_in_memory(); warn_user_about_loading_sevenz_in_memory();
if !user_wants_to_continue(options.input_file_path, options.question_policy, QuestionAction::Decompression)? { if !user_wants_to_continue(
options.input_file_path,
options.question_policy,
QuestionAction::Decompression,
)? {
return Ok(()); return Ok(());
} }
} }
@ -224,7 +244,12 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = smart_unpack(
|output_dir| { |output_dir| {
crate::archive::sevenz::decompress_sevenz(io::Cursor::new(vec), output_dir, options.password, options.quiet) crate::archive::sevenz::decompress_sevenz(
io::Cursor::new(vec),
output_dir,
options.password,
options.quiet,
)
}, },
options.output_dir, options.output_dir,
&options.output_file_path, &options.output_file_path,