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

Empty trash as much as possible

Browse source 
Fixes #1134
This commit is contained in:
Your Name 2025-12-05 18:51:40 -08:00 • committed by Jacob Kauffmann
parent f5b6b0fa2f
commit 977c878600
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() let items = trash::os_limited::list()
.map_err(|e| OperationError::from_err(e, &controller))?; .map_err(|e| OperationError::from_err(e, &controller))?;
let count = items.len(); let count = items.len();
let mut errors: Vec<trash::Error> = Vec::new();
for (i, item) in items.into_iter().enumerate() { for (i, item) in items.into_iter().enumerate() {
futures::executor::block_on(async { futures::executor::block_on(async {
controller controller
@ -874,11 +876,31 @@ impl Operation {
.map_err(|s| OperationError::from_state(s, &controller)) .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]) controller.set_progress(i as f32 / count as f32);
.map_err(|e| OperationError::from_err(e, &controller))?;
} }
// 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(()) Ok(())
}) })
.await .await