Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux: Handle modification events from file watcher (#11778)

Browse source 
Fixed #11595 


Release Notes:

- N/A
This commit is contained in:
CharlesChen0823 2024-05-15 02:00:26 +08:00 • committed by GitHub
parent d0dd8bf059
commit fd8336c8cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/fs/src/fs.rs
View file

@ -415,7 +415,7 @@ impl Fs for RealFs {
path: &Path, path: &Path,
_latency: Duration, _latency: Duration,
) -> Pin<Box<dyn Send + Stream<Item = Vec<PathBuf>>>> { ) -> Pin<Box<dyn Send + Stream<Item = Vec<PathBuf>>>> {
use notify::{event::EventKind, Watcher}; use notify::{event::EventKind, event::ModifyKind, Watcher};
// todo(linux): This spawns two threads, while the macOS impl // todo(linux): This spawns two threads, while the macOS impl
// only spawns one. Can we use a OnceLock or some such to make // only spawns one. Can we use a OnceLock or some such to make
// this better // this better
@ -443,6 +443,17 @@ impl Fs for RealFs {
if let Some(event) = event.ok() { if let Some(event) = event.ok() {
if event.paths.into_iter().any(|path| *path == watched_path) { if event.paths.into_iter().any(|path| *path == watched_path) {
match event.kind { match event.kind {
EventKind::Modify(ev) => {
if matches!(ev, ModifyKind::Name(_)) {
file_watcher
.watch(
watched_path.as_path(),
notify::RecursiveMode::Recursive,
)
.log_err();
let _ = tx.try_send(vec![watched_path.clone()]).ok();
}
}
EventKind::Create(_) => { EventKind::Create(_) => {
file_watcher file_watcher
.watch(watched_path.as_path(), notify::RecursiveMode::Recursive) .watch(watched_path.as_path(), notify::RecursiveMode::Recursive)