This commit is contained in:
Edward Shen 2022-01-15 21:40:36 -08:00
parent 67aa009746
commit f7431ca6a4
Signed by: edward
GPG key ID: 19182661E818369F

View file

@ -126,24 +126,22 @@ fn handle_gzip(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
let gzip_dec = flate2::read::GzDecoder::new(cursor); let gzip_dec = flate2::read::GzDecoder::new(cursor);
let mut archive = tar::Archive::new(gzip_dec); let mut archive = tar::Archive::new(gzip_dec);
if let Ok(files) = archive.entries() { if let Ok(files) = archive.entries() {
for file in files { for file in files.flatten() {
if let Ok(file) = file { let file_path = if let Ok(file_path) = file.path() {
let file_path = if let Ok(file_path) = file.path() { file_path.display().to_string()
file_path.display().to_string() } else {
} else { "<Invalid utf-8 path>".to_string()
"<Invalid utf-8 path>".to_string() };
}; entries.push(ArchiveMeta {
entries.push(ArchiveMeta { name: file_path,
name: file_path, file_size: file.size(),
file_size: file.size(), });
});
}
} }
} }
if entries.len() > 0 { if entries.is_empty() {
DecryptedData::Archive(blob, entries)
} else {
DecryptedData::Blob(blob) DecryptedData::Blob(blob)
} else {
DecryptedData::Archive(blob, entries)
} }
} }