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

listing: slight refactor when ensuring archive-only inputs (#331)

Browse Source
This commit is contained in:
Vinícius Miguel 2023-01-05 02:37:18 -03:00 committed by GitHub
parent 68237a2d67
commit 9854285c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands/mod.rs
View File

@ -67,6 +67,31 @@ fn build_archive_file_suggestion(path: &Path, suggested_extension: &str) -> Opti
None None
} }
/// In the context of listing archives, this function checks if `ouch` was told to list
/// the contents of a compressed file that is not an archive
fn check_for_non_archive_formats(files: &[PathBuf], formats: &[Vec<Extension>]) -> crate::Result<()> {
let mut not_archives = files
.iter()
.zip(formats)
.filter(|(_, formats)| !formats.first().map(Extension::is_archive).unwrap_or(false))
.map(|(path, _)| path)
.peekable();
if not_archives.peek().is_some() {
let not_archives: Vec<_> = not_archives.collect();
let error = FinalError::with_title("Cannot list archive contents")
.detail("Only archives can have their contents listed")
.detail(format!(
"Files are not archives: {}",
pretty_format_list_of_paths(&not_archives)
));
return Err(error.into());
}
Ok(())
}
/// This function checks what command needs to be run and performs A LOT of ahead-of-time checks /// This function checks what command needs to be run and performs A LOT of ahead-of-time checks
/// to assume everything is OK. /// to assume everything is OK.
/// ///
@ -267,23 +292,8 @@ pub fn run(
return Ok(()); return Ok(());
} }
let not_archives: Vec<PathBuf> = files // Ensure we were not told to list the content of a non-archive compressed file
.iter() check_for_non_archive_formats(&files, &formats)?;
.zip(&formats)
.filter(|(_, formats)| !formats.first().map(Extension::is_archive).unwrap_or(false))
.map(|(path, _)| path.clone())
.collect();
if !not_archives.is_empty() {
let error = FinalError::with_title("Cannot list archive contents")
.detail("Only archives can have their contents listed")
.detail(format!(
"Files are not archives: {}",
pretty_format_list_of_paths(&not_archives)
));
return Err(error.into());
}
let list_options = ListOptions { tree }; let list_options = ListOptions { tree };