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

commands: replace usage of "bundle" by "archive"

Browse Source
This commit is contained in:
Vinícius Rodrigues Miguel 2021-10-06 22:37:36 -03:00
parent 8bf087bbd7
commit a6eaef1220
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands.rs
View File

@ -65,7 +65,7 @@ pub fn run(command: Command, flags: &oof::Flags) -> crate::Result<()> {
let reason = FinalError::with_title(format!("Cannot compress to '{}'.", to_utf(&output_path))) let reason = FinalError::with_title(format!("Cannot compress to '{}'.", to_utf(&output_path)))
.detail("You are trying to compress multiple files.") .detail("You are trying to compress multiple files.")
.detail(format!("The compression format '{}' cannot receive multiple files.", &formats[0])) .detail(format!("The compression format '{}' cannot receive multiple files.", &formats[0]))
.detail("The only supported formats that bundle files into an archive are .tar and .zip.") .detail("The only supported formats that archive files into an archive are .tar and .zip.")
.hint(format!("Try inserting '.tar' or '.zip' before '{}'.", &formats[0])) .hint(format!("Try inserting '.tar' or '.zip' before '{}'.", &formats[0]))
.hint(format!("From: {}", output_path)) .hint(format!("From: {}", output_path))
.hint(format!(" To : {}", suggested_output_path)) .hint(format!(" To : {}", suggested_output_path))
@ -255,7 +255,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 bundle in '{}'.", to_utf(output_folder)); info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder));
return Ok(()); return Ok(());
} }
@ -287,12 +287,12 @@ 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 bundle in '{}'.", to_utf(output_path)); info!("Successfully uncompressed archive in '{}'.", to_utf(output_path));
} }
Tar => { Tar => {
utils::create_dir_if_non_existent(output_folder)?; utils::create_dir_if_non_existent(output_folder)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?; let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed bundle in '{}'.", to_utf(output_folder)); info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder));
} }
Zip => { Zip => {
utils::create_dir_if_non_existent(output_folder)?; utils::create_dir_if_non_existent(output_folder)?;
@ -310,7 +310,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 bundle in '{}'.", to_utf(output_folder)); info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder));
} }
} }