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

fix fatal error if read fails when compressing

Browse Source
This commit is contained in:
João M. Bezerra 2022-10-15 22:01:30 -03:00
parent 4d2ccf4873
commit 2da497c1ca
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands/mod.rs
View File

@ -9,7 +9,6 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use fs_err as fs;
use utils::colors; use utils::colors;
use crate::{ use crate::{
@ -183,22 +182,13 @@ pub fn run(
// about whether the command succeeded without such a message // about whether the command succeeded without such a message
info!(accessible, "Successfully compressed '{}'.", to_utf(&output_path)); info!(accessible, "Successfully compressed '{}'.", to_utf(&output_path));
} else { } else {
// If Ok(false) or Err() occurred, delete incomplete file if let Err(_) = utils::remove_file_or_dir(&output_path) {
// Print an extra alert message pointing out that we left a possibly
// CORRUPTED FILE at `output_path`
if let Err(err) = fs::remove_file(&output_path) {
eprintln!("{red}FATAL ERROR:\n", red = *colors::RED); eprintln!("{red}FATAL ERROR:\n", red = *colors::RED);
eprintln!(" Please manually delete '{}'.", to_utf(&output_path)); eprintln!(" Please manually delete '{}'.", to_utf(&output_path));
eprintln!( eprintln!(
" Compression failed and we could not delete '{}'.", " Compression failed and we could not delete '{}'.",
to_utf(&output_path), to_utf(&output_path),
); );
eprintln!(
" Error:{reset} {}{red}.{reset}\n",
err,
reset = *colors::RESET,
red = *colors::RED
);
} }
} }

3
src/utils/mod.rs
View File

@ -12,7 +12,8 @@ mod question;
pub use file_visibility::FileVisibilityPolicy; pub use file_visibility::FileVisibilityPolicy;
pub use formatting::{nice_directory_display, pretty_format_list_of_paths, strip_cur_dir, to_utf}; pub use formatting::{nice_directory_display, pretty_format_list_of_paths, strip_cur_dir, to_utf};
pub use fs::{ pub use fs::{
cd_into_same_dir_as, clear_path, create_dir_if_non_existent, dir_is_empty, is_symlink, try_infer_extension, cd_into_same_dir_as, clear_path, create_dir_if_non_existent, dir_is_empty, is_symlink, remove_file_or_dir,
try_infer_extension,
}; };
pub use question::{ pub use question::{
ask_to_create_file, user_wants_to_continue, user_wants_to_overwrite, QuestionAction, QuestionPolicy, ask_to_create_file, user_wants_to_continue, user_wants_to_overwrite, QuestionAction, QuestionPolicy,