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

Merge branch 'master' into expand-tilde

Browse source
This commit is contained in:
Levi Portenier 2025-12-19 12:34:39 -07:00 • committed by GitHub
commit 682bfeae67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/operation/mod.rs
View file

@ -866,6 +866,8 @@ impl Operation {
let items = trash::os_limited::list()
.map_err(|e| OperationError::from_err(e, &controller))?;
let count = items.len();
let mut errors: Vec<trash::Error> = Vec::new();
for (i, item) in items.into_iter().enumerate() {
futures::executor::block_on(async {
controller
@ -874,11 +876,31 @@ impl Operation {
.map_err(|s| OperationError::from_state(s, &controller))
})?;
controller.set_progress(i as f32 / count as f32);
if let Err(e) = trash::os_limited::purge_all([item]) {
errors.push(e);
}
trash::os_limited::purge_all([item])
.map_err(|e| OperationError::from_err(e, &controller))?;
controller.set_progress(i as f32 / count as f32);
}
// Report errors at the end
if !errors.is_empty() {
log::warn!("Failed to purge {} items:", errors.len());
for e in &errors {
log::warn!(" - {e}");
}
// Return an error to signal partial failure
return Err(OperationError::from_err(
format!(
"Failed to delete {} of {} items. Check log for details.",
errors.len(),
count
),
&controller,
));
}
Ok(())
})
.await