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

feat: add conditional smart_unpack when --dir is provided

Browse Source
This commit is contained in:
Talison Fabio 2025-03-31 09:07:29 -03:00 committed by João Marcos
parent 4f9a786e57
commit f65444d2fb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands/decompress.rs
View File

@ -69,7 +69,7 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
Box::new(fs::File::open(options.input_file_path)?) Box::new(fs::File::open(options.input_file_path)?)
}; };
let zip_archive = zip::ZipArchive::new(reader)?; let zip_archive = zip::ZipArchive::new(reader)?;
let files_unpacked = if let ControlFlow::Continue(files) = smart_unpack( let files_unpacked = if let ControlFlow::Continue(files) = execute_decompression(
|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,
@ -147,7 +147,7 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
1 1
} }
Tar => { Tar => {
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = execute_decompression(
|output_dir| crate::archive::tar::unpack_archive(reader, output_dir, options.quiet), |output_dir| crate::archive::tar::unpack_archive(reader, output_dir, options.quiet),
options.output_dir, options.output_dir,
&options.output_file_path, &options.output_file_path,
@ -179,7 +179,7 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
io::copy(&mut reader, &mut vec)?; io::copy(&mut reader, &mut vec)?;
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) = execute_decompression(
|output_dir| { |output_dir| {
crate::archive::zip::unpack_archive(zip_archive, output_dir, options.password, options.quiet) crate::archive::zip::unpack_archive(zip_archive, output_dir, options.password, options.quiet)
}, },
@ -213,7 +213,7 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
}) })
}; };
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = execute_decompression(
unpack_fn, unpack_fn,
options.output_dir, options.output_dir,
&options.output_file_path, &options.output_file_path,
@ -248,7 +248,7 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
let mut vec = vec![]; let mut vec = vec![];
io::copy(&mut reader, &mut vec)?; io::copy(&mut reader, &mut vec)?;
if let ControlFlow::Continue(files) = smart_unpack( if let ControlFlow::Continue(files) = execute_decompression(
|output_dir| { |output_dir| {
crate::archive::sevenz::decompress_sevenz( crate::archive::sevenz::decompress_sevenz(
io::Cursor::new(vec), io::Cursor::new(vec),
@ -317,8 +317,10 @@ fn unpack(
let has_files = output_dir.exists() && output_dir.read_dir().map(|dir| dir.count() > 0).unwrap_or(false); let has_files = output_dir.exists() && output_dir.read_dir().map(|dir| dir.count() > 0).unwrap_or(false);
let output_dir_cleaned = if has_files { let output_dir_cleaned = if has_files {
let output_file_path = utils::resolve_path_conflict(&output_dir, question_policy)?.unwrap(); match utils::resolve_path_conflict(&output_dir, question_policy)? {
output_file_path Some(path) => path,
None => return Ok(ControlFlow::Break(())),
}
} else { } else {
output_dir.to_owned() output_dir.to_owned()
}; };
@ -343,7 +345,6 @@ fn smart_unpack(
output_dir: &Path, output_dir: &Path,
output_file_path: &Path, output_file_path: &Path,
question_policy: QuestionPolicy, question_policy: QuestionPolicy,
is_output_dir_explicit: bool,
) -> crate::Result<ControlFlow<(), usize>> { ) -> crate::Result<ControlFlow<(), usize>> {
assert!(output_dir.exists()); assert!(output_dir.exists());
let temp_dir = tempfile::Builder::new().prefix(".tmp-ouch-").tempdir_in(output_dir)?; let temp_dir = tempfile::Builder::new().prefix(".tmp-ouch-").tempdir_in(output_dir)?;