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

Reload the trash on Created/Removed events

Browse source
This commit is contained in:
Josh Megnauth 2024-03-20 20:23:00 -04:00
parent f606a26482
commit 2e5911e6cc
No known key found for this signature in database
GPG key ID: 70813183462EFAD3
1 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/app.rs
View file

@ -165,6 +165,7 @@ pub enum Message {
PendingComplete(u64), PendingComplete(u64),
PendingError(u64, String), PendingError(u64, String),
PendingProgress(u64, f32), PendingProgress(u64, f32),
RescanTrash,
Rename(Option<Entity>), Rename(Option<Entity>),
RestoreFromTrash(Option<Entity>), RestoreFromTrash(Option<Entity>),
SystemThemeModeChange(cosmic_theme::ThemeMode), SystemThemeModeChange(cosmic_theme::ThemeMode),
@ -1100,6 +1101,7 @@ impl Application for App {
*progress = new_progress; *progress = new_progress;
} }
} }
Message::RescanTrash => return self.rescan_trash(),
Message::Rename(entity_opt) => { Message::Rename(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
@ -1692,13 +1694,34 @@ impl Application for App {
TypeId::of::<TrashWatcherSubscription>(), TypeId::of::<TrashWatcherSubscription>(),
25, 25,
|mut output| async move { |mut output| async move {
let watcher_res = notify::recommended_watcher(|event_res| match event_res { let watcher_res = notify::recommended_watcher(
Ok(event) => { move |event_res: Result<notify::Event, _>| match event_res {
log::info!("Trash event: {event:?}"); Ok(event)
} if matches!(
Err(e) => log::warn!("failed watching trash bin for changes: {e:?}"), event.kind,
}); notify::EventKind::Create(_) | notify::EventKind::Remove(_)
) =>
{
if let Err(e) = futures::executor::block_on(async {
output.send(Message::RescanTrash).await
}) {
log::warn!("trash needs to be rescanned but sending message failed: {e:?}");
}
}
Ok(_) => {}
Err(e) => {
log::warn!("failed watching trash bin for changes: {e:?}")
}
},
);
// TODO: Trash watching support for Windows, macOS, and other OSes
#[cfg(all(
unix,
not(target_os = "macos"),
not(target_os = "ios"),
not(target_os = "android")
))]
match (watcher_res, trash::os_limited::trash_folders()) { match (watcher_res, trash::os_limited::trash_folders()) {
(Ok(mut watcher), Ok(trash_bins)) => { (Ok(mut watcher), Ok(trash_bins)) => {
for path in trash_bins { for path in trash_bins {