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

Use the -y and -n flags when compressing to a file that already exists

Browse Source
This commit is contained in:
Vinícius Rodrigues Miguel 2021-03-29 01:52:52 -03:00
parent 0f0b086943
commit 5ac3540145
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/evaluator.rs
View File

@ -113,12 +113,13 @@ impl Evaluator {
.unwrap_or_else(|| output_file_path.as_os_str()); .unwrap_or_else(|| output_file_path.as_os_str());
if filename == "." { if filename == "." {
// I believe this is only possible when the supplied inout has a name // I believe this is only possible when the supplied input has a name
// of the sort `.tar` or `.zip' and no output has been supplied. // of the sort `.tar` or `.zip' and no output has been supplied.
filename = OsStr::new("ouch-output"); filename = OsStr::new("ouch-output");
} }
let filename = PathBuf::from(filename); let filename = PathBuf::from(filename);
// If there is a decompressor to use, we'll create a file in-memory and decompress it // If there is a decompressor to use, we'll create a file in-memory and decompress it
let decompressor = match decompressor { let decompressor = match decompressor {
Some(decompressor) => decompressor, Some(decompressor) => decompressor,
@ -126,7 +127,7 @@ impl Evaluator {
// There is no more processing to be done on the input file (or there is but currently unsupported) // There is no more processing to be done on the input file (or there is but currently unsupported)
// Therefore, we'll save what we have in memory into a file. // Therefore, we'll save what we have in memory into a file.
println!("{}: saving to {:?}.", "info".yellow(), filename); println!("{}: saving to {:?}.", "info".yellow(), filename);
// TODO: use -y and -n flags
let mut f = fs::File::create(output_file_path.join(filename))?; let mut f = fs::File::create(output_file_path.join(filename))?;
f.write_all(&bytes)?; f.write_all(&bytes)?;
return Ok(()); return Ok(());
@ -148,15 +149,14 @@ impl Evaluator {
Ok(()) Ok(())
} }
fn compress_files(files: Vec<PathBuf>, mut output: File) -> crate::Result<()> { fn compress_files(files: Vec<PathBuf>, mut output: File, flags: Flags) -> crate::Result<()> {
let confirm = Confirmation::new("Do you want to overwrite 'FILE'?", Some("FILE")); let confirm = Confirmation::new("Do you want to overwrite 'FILE'?", Some("FILE"));
let (first_compressor, second_compressor) = Self::get_compressor(&output)?; let (first_compressor, second_compressor) = Self::get_compressor(&output)?;
// TODO: use -y and -n here // TODO: use -y and -n here
let output_path = output.path.clone(); let output_path = output.path.clone();
if output_path.exists() { if output_path.exists() {
let output_path_str = &*output_path.to_string_lossy(); if !utils::permission_for_overwriting(&output_path, flags, &confirm)? {
if !confirm.ask(Some(output_path_str))? {
// The user does not want to overwrite the file // The user does not want to overwrite the file
return Ok(()); return Ok(());
} }
@ -231,7 +231,7 @@ impl Evaluator {
CommandKind::Compression(files_to_compress) => { CommandKind::Compression(files_to_compress) => {
// Safe to unwrap since output is mandatory for compression // Safe to unwrap since output is mandatory for compression
let output = output.unwrap(); let output = output.unwrap();
Self::compress_files(files_to_compress, output)?; Self::compress_files(files_to_compress, output, flags)?;
} }
CommandKind::Decompression(files_to_decompress) => { CommandKind::Decompression(files_to_decompress) => {
for file in files_to_decompress { for file in files_to_decompress {