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

chore: use compio::fs::rename for quick renames

Browse source
This commit is contained in:
Michael Aaron Murphy 2026-04-10 06:09:51 +02:00
parent 15e40461e5
commit e21989aaa3
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/operation/mod.rs
View file

@ -114,7 +114,7 @@ async fn copy_or_move(
); );
// Handle duplicate file names by renaming paths // Handle duplicate file names by renaming paths
let mut from_to_pairs: Vec<(PathBuf, PathBuf)> = paths let from_to_pairs_iter = paths
.into_iter() .into_iter()
.zip(std::iter::repeat(to.as_path())) .zip(std::iter::repeat(to.as_path()))
.filter_map(|(from, to)| { .filter_map(|(from, to)| {
@ -132,36 +132,46 @@ async fn copy_or_move(
//TODO: how to handle from missing file name? //TODO: how to handle from missing file name?
None None
} }
}) });
.collect();
// Attempt quick and simple renames // Attempt quick and simple renames
//TODO: allow rename to be used for directories in recursive context? //TODO: allow rename to be used for directories in recursive context?
if matches!(method, Method::Move { .. }) {
from_to_pairs.retain(|(from, to)| {
//TODO: show replace dialog here?
if to.exists() {
return true;
}
//TODO: use compio::fs::rename? let from_to_pairs: Vec<(PathBuf, PathBuf)> = if matches!(method, Method::Move { .. }) {
match fs::rename(from, to) { from_to_pairs_iter
Ok(()) => { .map(|(from, to)| async move {
log::info!("renamed {} to {}", from.display(), to.display()); //TODO: show replace dialog here?
false if to.exists() {
return Some((from, to));
} }
Err(err) => {
log::info!( match compio::fs::rename(&from, &to).await {
"failed to rename {} to {}, fallback to recursive move: {}", Ok(()) => {
from.display(), log::info!("renamed {} to {}", from.display(), to.display());
to.display(), None
err }
); Err(err) => {
true log::info!(
"failed to rename {} to {}, fallback to recursive move: {}",
from.display(),
to.display(),
err
);
Some((from, to))
}
} }
} })
}); .collect::<cosmic::iced::futures::stream::FuturesOrdered<_>>()
} .fold(Vec::new(), |mut pairs, pair| async move {
if let Some(pair) = pair {
pairs.push(pair);
}
pairs
})
.await
} else {
from_to_pairs_iter.collect()
};
let mut context = Context::new(controller.clone()); let mut context = Context::new(controller.clone());
@ -219,7 +229,7 @@ pub async fn sync_to_disk(
} }
})) }))
.buffer_unordered(32) .buffer_unordered(32)
.collect::<Vec<_>>() .collect::<()>()
.await; .await;
// Sync directories to disk // Sync directories to disk
@ -229,7 +239,7 @@ pub async fn sync_to_disk(
} }
})) }))
.buffer_unordered(16) .buffer_unordered(16)
.collect::<Vec<_>>() .collect::<()>()
.await; .await;
} }