mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

..

Browse source
This commit is contained in:
sxyazi 2024-04-05 02:12:01 +08:00
parent 1a079bf05c
commit 0a04a3cdd4
No known key found for this signature in database
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
yazi-core/src/manager/watcher.rs
View file

@ -60,14 +60,14 @@ impl Watcher {
pub(super) fn watch(&mut self, mut new: HashSet<&Url>) { pub(super) fn watch(&mut self, mut new: HashSet<&Url>) {
new.retain(|&u| u.is_regular()); new.retain(|&u| u.is_regular());
let (to_unwatch, to_watch): (HashSet<_>, HashSet<_>) = {
let guard = WATCHED.read(); let old = WATCHED.read();
let old: HashSet<_> = guard.iter().collect(); let old: HashSet<_> = old.iter().collect();
(
let (to_unwatch, to_watch): (HashSet<_>, HashSet<_>) = (
old.difference(&new).map(|&x| x.clone()).collect(), old.difference(&new).map(|&x| x.clone()).collect(),
new.difference(&old).map(|&x| x.clone()).collect(), new.difference(&old).map(|&x| x.clone()).collect(),
) );
};
self.tx.send((to_unwatch, to_watch)).ok(); self.tx.send((to_unwatch, to_watch)).ok();
} }
@ -122,7 +122,10 @@ impl Watcher {
} }
} }
Self::sync_linked(); if !rx.has_changed().unwrap_or(false) {
Self::sync_linked().await;
}
if rx.changed().await.is_err() { if rx.changed().await.is_err() {
break; break;
} }
@ -161,7 +164,7 @@ impl Watcher {
} }
} }
fn sync_linked() { async fn sync_linked() {
let mut new = WATCHED.read().clone(); let mut new = WATCHED.read().clone();
LINKED.write().retain(|k, _| new.remove(k)); LINKED.write().retain(|k, _| new.remove(k));
@ -178,10 +181,8 @@ impl Watcher {
}; };
} }
tokio::spawn(async move {
let old: Vec<_> = LINKED.read().keys().cloned().collect(); let old: Vec<_> = LINKED.read().keys().cloned().collect();
go!(new); go!(new);
go!(old); go!(old);
});
} }
} }