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

fix warning for zip with additional formats

Browse Source
This commit is contained in:
Crypto-Spartan 2022-01-04 22:45:24 +00:00
parent 308b8f7e90
commit fa2af20814
1 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/commands.rs
View File

@ -158,8 +158,14 @@ pub fn run(args: Opts, question_policy: QuestionPolicy) -> crate::Result<()> {
} }
let compress_result = compress_files(files, formats, output_file, &output_path, question_policy); let compress_result = compress_files(files, formats, output_file, &output_path, question_policy);
// If any error occurred, delete incomplete file if let Ok(true) = compress_result {
if compress_result.is_err() { // this is only printed once, so it doesn't result in much text. On the other hand,
// having a final status message is important especially in an accessibility context
// as screen readers may not read a commands exit code, making it hard to reason
// about whether the command succeeded without such a message
info!(accessible, "Successfully compressed '{}'.", to_utf(output_path));
} else {
// If Ok(false) or Err() occurred, delete incomplete file
// Print an extra alert message pointing out that we left a possibly // Print an extra alert message pointing out that we left a possibly
// CORRUPTED FILE at `output_path` // CORRUPTED FILE at `output_path`
if let Err(err) = fs::remove_file(&output_path) { if let Err(err) = fs::remove_file(&output_path) {
@ -168,12 +174,6 @@ pub fn run(args: Opts, question_policy: QuestionPolicy) -> crate::Result<()> {
eprintln!(" Compression failed and we could not delete '{}'.", to_utf(&output_path),); eprintln!(" Compression failed and we could not delete '{}'.", to_utf(&output_path),);
eprintln!(" Error:{reset} {}{red}.{reset}\n", err, reset = *colors::RESET, red = *colors::RED); eprintln!(" Error:{reset} {}{red}.{reset}\n", err, reset = *colors::RESET, red = *colors::RED);
} }
} else {
// this is only printed once, so it doesn't result in much text. On the other hand,
// having a final status message is important especially in an accessibility context
// as screen readers may not read a commands exit code, making it hard to reason
// about whether the command succeeded without such a message
info!(accessible, "Successfully compressed '{}'.", to_utf(output_path));
} }
compress_result?; compress_result?;
@ -285,7 +285,7 @@ fn compress_files(
output_file: fs::File, output_file: fs::File,
output_dir: &Path, output_dir: &Path,
question_policy: QuestionPolicy, question_policy: QuestionPolicy,
) -> crate::Result<()> { ) -> crate::Result<bool> {
// The next lines are for displaying the progress bar // The next lines are for displaying the progress bar
// If the input files contain a directory, then the total size will be underestimated // If the input files contain a directory, then the total size will be underestimated
let (total_input_size, precise) = files let (total_input_size, precise) = files
@ -353,16 +353,18 @@ fn compress_files(
writer.flush()?; writer.flush()?;
} }
Zip => { Zip => {
eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET); if formats.len() > 1 {
eprintln!( eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET);
"\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\ eprintln!(
\n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\ "\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\
\n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!" \n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\
); \n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!"
);
// give user the option to continue compressing after warning is shown // give user the option to continue compressing after warning is shown
if !user_wants_to_continue(output_dir, question_policy, QuestionAction::Compression)? { if !user_wants_to_continue(output_dir, question_policy, QuestionAction::Compression)? {
return Ok(()); return Ok(false);
}
} }
let mut vec_buffer = io::Cursor::new(vec![]); let mut vec_buffer = io::Cursor::new(vec![]);
@ -392,7 +394,7 @@ fn compress_files(
} }
} }
Ok(()) Ok(true)
} }
// Decompress a file // Decompress a file
@ -515,16 +517,18 @@ fn decompress_file(
}; };
} }
Zip => { Zip => {
eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET); if formats.len() > 1 {
eprintln!( eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET);
"\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\ eprintln!(
\n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\ "\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\
\n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!" \n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\
); \n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!"
);
// give user the option to continue decompressing after warning is shown // give user the option to continue decompressing after warning is shown
if !user_wants_to_continue(input_file_path, question_policy, QuestionAction::Decompression)? { if !user_wants_to_continue(input_file_path, question_policy, QuestionAction::Decompression)? {
return Ok(()); return Ok(());
}
} }
let mut vec = vec![]; let mut vec = vec![];
@ -612,16 +616,19 @@ fn list_archive_contents(
let files: Box<dyn Iterator<Item = crate::Result<FileInArchive>>> = match formats[0] { let files: Box<dyn Iterator<Item = crate::Result<FileInArchive>>> = match formats[0] {
Tar => Box::new(crate::archive::tar::list_archive(tar::Archive::new(reader))), Tar => Box::new(crate::archive::tar::list_archive(tar::Archive::new(reader))),
Zip => { Zip => {
eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET);
eprintln!(
"\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\
\n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\
\n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!"
);
// give user the option to continue decompressing after warning is shown if formats.len() > 1 {
if !user_wants_to_continue(archive_path, question_policy, QuestionAction::Decompression)? { eprintln!("{orange}[WARNING]{reset}", orange = *colors::ORANGE, reset = *colors::RESET);
return Ok(()); eprintln!(
"\tThere is a limitation for .zip archives with extra extensions. (e.g. <file>.zip.gz)\
\n\tThe design of .zip makes it impossible to compress via stream, so it must be done entirely in memory.\
\n\tBy compressing .zip with extra compression formats, you can run out of RAM if the file is too large!"
);
// give user the option to continue decompressing after warning is shown
if !user_wants_to_continue(archive_path, question_policy, QuestionAction::Decompression)? {
return Ok(());
}
} }
let mut vec = vec![]; let mut vec = vec![];