github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 19:45:29 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

fix(archive): handle errors for unsupported formats

Browse Source 
Handle errors for unsupported formats in RAR and 7z archives by returning appropriate error messages.
This commit is contained in:
ttyS3 2024-09-06 15:02:09 +00:00 committed by João Marcos
parent bafbd83bd7
commit 7e830d9f53
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/archive/rar.rs
View File

@ -53,13 +53,16 @@ pub fn list_archive(
Some(password) => Archive::with_password(archive_path, password), Some(password) => Archive::with_password(archive_path, password),
None => Archive::new(archive_path), None => Archive::new(archive_path),
}; };
archive.open_for_listing().expect("cannot open archive").map(|item| { match archive.open_for_listing() {
let item = item?; Ok(iter) => iter.map(|item| {
let is_dir = item.is_directory(); let item = item?;
let path = item.filename; let is_dir = item.is_directory();
let path = item.filename;
Ok(FileInArchive { path, is_dir }) Ok(FileInArchive { path, is_dir })
}) }).collect::<Vec<_>>().into_iter(),
Err(e) => vec![Err(Error::UnsupportedFormat {reason:e.to_string()})].into_iter(),
}
} }
pub fn no_compression() -> Error { pub fn no_compression() -> Error {

2
src/archive/sevenz.rs
View File

@ -187,7 +187,7 @@ pub fn list_archive(
if let Err(e) = reader { if let Err(e) = reader {
return vec![Err(Error::IoError {reason:e.to_string()})].into_iter(); return vec![Err(Error::IoError {reason:e.to_string()})].into_iter();
} }
let reader = reader.unwrap(); let reader = reader.unwrap();
let mut files = Vec::new(); let mut files = Vec::new();