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

Go back to home if location is unmounted, fixes #148

Browse source
This commit is contained in:
Jeremy Soller 2024-05-31 10:39:27 -06:00
parent aab8d310df
commit e6f8fdd1e6
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
2 changed files with 63 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/app.rs
View file

@ -1145,12 +1145,67 @@ impl Application for App {
} }
} }
Message::MounterItems(mounter_key, mounter_items) => { Message::MounterItems(mounter_key, mounter_items) => {
// Check for unmounted folders
let mut unmounted = Vec::new();
if let Some(old_items) = self.mounter_items.get(&mounter_key) {
for old_item in old_items.iter() {
if let Some(old_path) = old_item.path() {
if old_item.is_mounted() {
let mut still_mounted = false;
for item in mounter_items.iter() {
if let Some(path) = item.path() {
if path == old_path {
if item.is_mounted() {
still_mounted = true;
break;
}
}
}
}
if !still_mounted {
unmounted.push(Location::Path(old_path));
}
}
}
}
}
// Go back to home in any tabs that were unmounted
let mut commands = Vec::new();
{
let home_location = Location::Path(home_dir());
let entities: Vec<_> = self.tab_model.iter().collect();
for entity in entities {
let title_opt = match self.tab_model.data_mut::<Tab>(entity) {
Some(tab) => {
if unmounted.contains(&tab.location) {
tab.change_location(&home_location, None);
Some(tab.title())
} else {
None
}
}
None => None,
};
if let Some(title) = title_opt {
self.tab_model.text_set(entity, title);
commands.push(self.rescan_tab(entity, home_location.clone()));
}
}
if !commands.is_empty() {
commands.push(self.update_title());
commands.push(self.update_watcher());
}
}
// Insert new items // Insert new items
self.mounter_items.insert(mounter_key, mounter_items); self.mounter_items.insert(mounter_key, mounter_items);
// Update nav bar // Update nav bar
//TODO: this could change favorites IDs while they are in use //TODO: this could change favorites IDs while they are in use
self.update_nav_model(); self.update_nav_model();
return Command::batch(commands);
} }
Message::NewItem(entity_opt, dir) => { Message::NewItem(entity_opt, dir) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
@ -1172,7 +1227,6 @@ impl Application for App {
let entities: Vec<_> = self.tab_model.iter().collect(); let entities: Vec<_> = self.tab_model.iter().collect();
for entity in entities { for entity in entities {
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
//TODO: support reloading trash, somehow
if let Location::Path(path) = &tab.location { if let Location::Path(path) = &tab.location {
let mut contains_change = false; let mut contains_change = false;
for event in events.iter() { for event in events.iter() {
@ -2099,6 +2153,8 @@ impl Application for App {
move |events_res: notify_debouncer_full::DebounceEventResult| { move |events_res: notify_debouncer_full::DebounceEventResult| {
match events_res { match events_res {
Ok(mut events) => { Ok(mut events) => {
eprintln!("{:?}", events);
events.retain(|event| { events.retain(|event| {
match &event.kind { match &event.kind {
notify::EventKind::Access(_) => { notify::EventKind::Access(_) => {

12
src/mounter/gvfs.rs
View file

@ -86,21 +86,21 @@ impl Gvfs {
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_mount_changed(move |_monitor, mount| { monitor.connect_mount_changed(move |_monitor, mount| {
eprintln!("mount changed {}", MountExt::name(mount)); log::info!("mount changed {}", MountExt::name(mount));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_mount_added(move |_monitor, mount| { monitor.connect_mount_added(move |_monitor, mount| {
eprintln!("mount added {}", MountExt::name(mount)); log::info!("mount added {}", MountExt::name(mount));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_mount_removed(move |_monitor, mount| { monitor.connect_mount_removed(move |_monitor, mount| {
eprintln!("mount removed {}", MountExt::name(mount)); log::info!("mount removed {}", MountExt::name(mount));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }
@ -108,21 +108,21 @@ impl Gvfs {
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_volume_changed(move |_monitor, volume| { monitor.connect_volume_changed(move |_monitor, volume| {
eprintln!("volume changed {}", VolumeExt::name(volume)); log::info!("volume changed {}", VolumeExt::name(volume));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_volume_added(move |_monitor, volume| { monitor.connect_volume_added(move |_monitor, volume| {
eprintln!("volume added {}", VolumeExt::name(volume)); log::info!("volume added {}", VolumeExt::name(volume));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }
{ {
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
monitor.connect_volume_removed(move |_monitor, volume| { monitor.connect_volume_removed(move |_monitor, volume| {
eprintln!("volume removed {}", VolumeExt::name(volume)); log::info!("volume removed {}", VolumeExt::name(volume));
event_tx.send(Event::Changed).unwrap(); event_tx.send(Event::Changed).unwrap();
}); });
} }