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

Merge pull request #546 from iamkartiknayak/fix/compound-extension

Browse source 
fix(copy_unique_path): fix compound file extension handling
This commit is contained in:
Jeremy Soller 2024-10-03 09:56:05 -06:00 • committed by GitHub
commit ef1c7beab1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 47 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/operation.rs
View file

@ -326,56 +326,71 @@ async fn copy_or_move(
} }
fn copy_unique_path(from: &Path, to: &Path) -> PathBuf { fn copy_unique_path(from: &Path, to: &Path) -> PathBuf {
// List of compound extensions to check
const COMPOUND_EXTENSIONS: &[&str] = &[
".tar.gz",
".tar.bz2",
".tar.xz",
".tar.zst",
".tar.lz",
".tar.lzma",
".tar.sz",
".tar.lzo",
".tar.br",
".tar.Z",
".tar.pz",
];
let mut to = to.to_owned(); let mut to = to.to_owned();
if let Some(file_name) = from.file_name().and_then(|name| name.to_str()) { if let Some(file_name) = from.file_name().and_then(|name| name.to_str()) {
let is_dir = from.is_dir(); let (stem, ext) = if from.is_dir() {
let (stem, ext) = if !is_dir {
match from.extension().and_then(|e| e.to_str()) {
Some(ext) => {
let stem = from
.file_stem()
.and_then(|s| s.to_str())
.unwrap_or(file_name);
(stem.to_string(), Some(ext.to_string()))
}
None => (file_name.to_string(), None),
}
} else {
(file_name.to_string(), None) (file_name.to_string(), None)
} else {
let file_name = file_name.to_string();
COMPOUND_EXTENSIONS
.iter()
.find(|&&ext| file_name.ends_with(ext))
.map(|&ext| {
(
file_name.strip_suffix(ext).unwrap().to_string(),
Some(ext[1..].to_string()),
)
})
.unwrap_or_else(|| {
from.file_stem()
.and_then(|s| s.to_str())
.map(|stem| {
(
stem.to_string(),
from.extension()
.and_then(|e| e.to_str())
.map(|e| e.to_string()),
)
})
.unwrap_or((file_name, None))
})
}; };
let mut n = 0u32; for n in 0.. {
loop {
let new_name = if n == 0 { let new_name = if n == 0 {
file_name.to_string() file_name.to_string()
} else { } else {
if is_dir { match ext {
format!("{} ({} {})", file_name, fl!("copy_noun"), n) Some(ref ext) => format!("{} ({} {}).{}", stem, fl!("copy_noun"), n, ext),
} else { None => format!("{} ({} {})", stem, fl!("copy_noun"), n),
match &ext {
Some(ext) => format!("{} ({} {}).{}", stem, fl!("copy_noun"), n, ext),
None => format!("{} ({} {})", stem, 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)) {
break to; break;
} }
// Continue if a copy with index exists // Continue if a copy with index exists
to.pop(); to.pop();
n = if let Some(n) = n.checked_add(1) {
n
} else {
break to;
};
} }
} else {
to
} }
to
} }
fn file_name<'a>(path: &'a Path) -> Cow<'a, str> { fn file_name<'a>(path: &'a Path) -> Cow<'a, str> {