leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(extract): preserve full folder names during extraction, fixes #504

Browse source
This commit is contained in:
Kartik Nayak 2024-09-28 19:09:27 +05:30
parent 8354fa6428
commit c7ec9fb8de
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/operation.rs
View file

@ -91,6 +91,17 @@ fn handle_progress_state(
} }
} }
fn get_directory_name(file_name: &str) -> &str {
const SUPPORTED_EXTENSIONS: [&str; 4] = [".tar.gz", ".tgz", ".tar", ".zip"];
for ext in &SUPPORTED_EXTENSIONS {
if file_name.ends_with(ext) {
return &file_name[..file_name.len() - ext.len()];
}
}
file_name
}
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub enum ReplaceResult { pub enum ReplaceResult {
Replace(bool), Replace(bool),
@ -683,12 +694,10 @@ impl Operation {
let to = to.to_owned(); let to = to.to_owned();
if let Some(file_stem) = path.file_stem() { if let Some(file_name) = path.file_name().and_then(|f| f.to_str()) {
let mut new_dir = to.join(file_stem); let dir_name = get_directory_name(file_name);
// Make sure all extension parts are removed (file_stem may still contain them) let mut new_dir = to.join(dir_name);
while new_dir.extension().is_some() {
new_dir.set_extension("");
}
if new_dir.exists() { if new_dir.exists() {
if let Some(new_dir_parent) = new_dir.parent() { if let Some(new_dir_parent) = new_dir.parent() {
new_dir = copy_unique_path(&new_dir, new_dir_parent); new_dir = copy_unique_path(&new_dir, new_dir_parent);
@ -702,21 +711,21 @@ impl Operation {
.map(io::BufReader::new) .map(io::BufReader::new)
.map(flate2::read::GzDecoder::new) .map(flate2::read::GzDecoder::new)
.map(tar::Archive::new) .map(tar::Archive::new)
.and_then(|mut archive| archive.unpack(new_dir)) .and_then(|mut archive| archive.unpack(&new_dir))
.map_err(err_str)? .map_err(err_str)?
} }
"application/x-tar" => fs::File::open(path) "application/x-tar" => fs::File::open(path)
.map(io::BufReader::new) .map(io::BufReader::new)
.map(tar::Archive::new) .map(tar::Archive::new)
.and_then(|mut archive| archive.unpack(new_dir)) .and_then(|mut archive| archive.unpack(&new_dir))
.map_err(err_str)?, .map_err(err_str)?,
"application/zip" => fs::File::open(path) "application/zip" => fs::File::open(path)
.map(io::BufReader::new) .map(io::BufReader::new)
.map(zip::ZipArchive::new) .map(zip::ZipArchive::new)
.map_err(err_str)? .map_err(err_str)?
.and_then(|mut archive| archive.extract(new_dir)) .and_then(|mut archive| archive.extract(&new_dir))
.map_err(err_str)?, .map_err(err_str)?,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
"application/x-bzip" | "application/x-bzip-compressed-tar" => { "application/x-bzip" | "application/x-bzip-compressed-tar" => {
fs::File::open(path) fs::File::open(path)
.map(io::BufReader::new) .map(io::BufReader::new)