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

refac: simplify smart_unpack to remove redundant code and make clippy happy

Browse Source
This commit is contained in:
figsoda 2022-08-14 12:24:41 +08:00
parent 72295d872c
commit a1c943923c
1 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/commands/decompress.rs
View File

@ -50,17 +50,8 @@ pub fn decompress_file(
{ {
let zip_archive = zip::ZipArchive::new(reader)?; let zip_archive = zip::ZipArchive::new(reader)?;
let files = if let ControlFlow::Continue(files) = smart_unpack( let files = if let ControlFlow::Continue(files) = smart_unpack(
Box::new(move |output_dir| { |output_dir, progress| crate::archive::zip::unpack_archive(zip_archive, output_dir, progress),
let mut progress = Progress::new_accessible_aware(total_input_size, true, None); total_input_size,
crate::archive::zip::unpack_archive(
zip_archive,
output_dir,
progress
.as_mut()
.map(Progress::display_handle)
.unwrap_or(&mut io::stdout()),
)
}),
output_dir, output_dir,
&output_file_path, &output_file_path,
question_policy, question_policy,
@ -130,17 +121,8 @@ pub fn decompress_file(
} }
Tar => { Tar => {
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = smart_unpack(
Box::new(move |output_dir| { |output_dir, progress| crate::archive::tar::unpack_archive(reader, output_dir, progress),
let mut progress = Progress::new_accessible_aware(total_input_size, true, None); total_input_size,
crate::archive::tar::unpack_archive(
reader,
output_dir,
progress
.as_mut()
.map(Progress::display_handle)
.unwrap_or(&mut io::stdout()),
)
}),
output_dir, output_dir,
&output_file_path, &output_file_path,
question_policy, question_policy,
@ -165,17 +147,8 @@ pub fn decompress_file(
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(
Box::new(move |output_dir| { |output_dir, progress| crate::archive::zip::unpack_archive(zip_archive, output_dir, progress),
let mut progress = Progress::new_accessible_aware(total_input_size, true, None); total_input_size,
crate::archive::zip::unpack_archive(
zip_archive,
output_dir,
progress
.as_mut()
.map(Progress::display_handle)
.unwrap_or(&mut io::stdout()),
)
}),
output_dir, output_dir,
&output_file_path, &output_file_path,
question_policy, question_policy,
@ -207,7 +180,8 @@ pub fn decompress_file(
/// output_dir named after the archive (given by `output_file_path`) /// output_dir named after the archive (given by `output_file_path`)
/// Note: This functions assumes that `output_dir` exists /// Note: This functions assumes that `output_dir` exists
fn smart_unpack( fn smart_unpack(
unpack_fn: Box<dyn FnOnce(&Path) -> crate::Result<Vec<PathBuf>>>, unpack_fn: impl FnOnce(&Path, &mut dyn Write) -> crate::Result<Vec<PathBuf>>,
total_input_size: u64,
output_dir: &Path, output_dir: &Path,
output_file_path: &Path, output_file_path: &Path,
question_policy: QuestionPolicy, question_policy: QuestionPolicy,
@ -222,7 +196,13 @@ fn smart_unpack(
); );
// unpack the files // unpack the files
let files = unpack_fn(temp_dir_path)?; let files = unpack_fn(
temp_dir_path,
Progress::new_accessible_aware(total_input_size, true, None)
.as_mut()
.map(Progress::display_handle)
.unwrap_or(&mut io::stdout()),
)?;
let root_contains_only_one_element = fs::read_dir(&temp_dir_path)?.count() == 1; let root_contains_only_one_element = fs::read_dir(&temp_dir_path)?.count() == 1;
if root_contains_only_one_element { if root_contains_only_one_element {