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

Use a same term as in command

Browse Source
This commit is contained in:
TATSUNO Yasuhiro 2021-10-20 10:54:14 +09:00
parent 13aad5db87
commit b8a2c3899e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands.rs
View File

@ -318,7 +318,7 @@ fn decompress_file(
utils::create_dir_if_non_existent(output_folder)?; utils::create_dir_if_non_existent(output_folder)?;
let zip_archive = zip::ZipArchive::new(reader)?; let zip_archive = zip::ZipArchive::new(reader)?;
let _files = crate::archive::zip::unpack_archive(zip_archive, output_folder, flags)?; let _files = crate::archive::zip::unpack_archive(zip_archive, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
return Ok(()); return Ok(());
} }
@ -352,31 +352,31 @@ fn decompress_file(
let mut writer = fs::File::create(&output_path)?; let mut writer = fs::File::create(&output_path)?;
io::copy(&mut reader, &mut writer)?; io::copy(&mut reader, &mut writer)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_path)); info!("Successfully decompressed archive in '{}'.", to_utf(output_path));
} }
Tar => { Tar => {
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
Tgz => { Tgz => {
let reader = chain_reader_decoder(&Gzip, reader)?; let reader = chain_reader_decoder(&Gzip, reader)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
Tbz => { Tbz => {
let reader = chain_reader_decoder(&Bzip, reader)?; let reader = chain_reader_decoder(&Bzip, reader)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
Tlzma => { Tlzma => {
let reader = chain_reader_decoder(&Lzma, reader)?; let reader = chain_reader_decoder(&Lzma, reader)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
Tzst => { Tzst => {
let reader = chain_reader_decoder(&Zstd, reader)?; let reader = chain_reader_decoder(&Zstd, reader)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
Zip => { Zip => {
eprintln!("Compressing first into .zip."); eprintln!("Compressing first into .zip.");
@ -392,7 +392,7 @@ fn decompress_file(
let _ = crate::archive::zip::unpack_archive(zip_archive, output_folder, flags)?; let _ = crate::archive::zip::unpack_archive(zip_archive, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully decompressed archive in '{}'.", to_utf(output_folder));
} }
} }