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

fix(extract): correctly append copy suffix for existing folder names

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

25
src/operation.rs
View file

@ -330,30 +330,21 @@ async fn copy_or_move(
fn copy_unique_path(from: &Path, to: &Path) -> PathBuf { fn copy_unique_path(from: &Path, to: &Path) -> PathBuf {
let mut to = to.to_owned(); let mut to = to.to_owned();
// Separate the full file name into its file name plus extension. if let Some(file_name) = from.file_name().and_then(|name| name.to_str()) {
// `[Path::file_stem]` returns the full name for dotfiles (e.g.
// .someconf is the file name)
if let (Some(stem), ext) = (
// FIXME: Replace `[Path::file_stem]` with `[Path::file_prefix]` when stablized to handle .tar.gz et al. better
from.file_stem().and_then(|name| name.to_str()),
from.extension()
.and_then(|ext| ext.to_str())
.unwrap_or_default(),
) {
// '.' needs to be re-added for paths with extensions.
let dot = if ext.is_empty() { "" } else { "." };
let mut n = 0u32; let mut n = 0u32;
// Loop until a valid `copy n` variant is found
loop { loop {
n = if let Some(n) = n.checked_add(1) { n = if let Some(n) = n.checked_add(1) {
n n
} else { } else {
// TODO: Return error? fs_extra will handle it anyway
break to; break to;
}; };
// Rebuild file name let new_name = if n == 0 {
let new_name = format!("{stem} ({} {n}){dot}{ext}", fl!("copy_noun")); file_name.to_string()
} else {
format!("{} ({} {})", file_name, fl!("copy_noun"), n)
};
to = to.join(new_name); to = to.join(new_name);
if !matches!(to.try_exists(), Ok(true)) { if !matches!(to.try_exists(), Ok(true)) {
@ -725,7 +716,7 @@ impl Operation {
.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)