From 6937bcb67d825938d862cd1792af02e00e1d1a06 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 24 Jun 2020 16:58:49 +0200 Subject: Less error-prone naming --- crates/vfs-notify/src/lib.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'crates/vfs-notify') diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs index 5b4978285..b3d7c414c 100644 --- a/crates/vfs-notify/src/lib.rs +++ b/crates/vfs-notify/src/lib.rs @@ -89,8 +89,8 @@ impl LoaderActor { match event { Event::Message(msg) => match msg { Message::Config(config) => { - let n_entries_total = config.load.len(); - self.send(loader::Message::Progress { n_entries_total, n_entries_done: 0 }); + let n_total = config.load.len(); + self.send(loader::Message::Progress { n_total, n_done: 0 }); self.unwatch_all(); self.config.clear(); @@ -99,10 +99,7 @@ impl LoaderActor { let watch = config.watch.contains(&i); let files = self.load_entry(entry, watch); self.send(loader::Message::Loaded { files }); - self.send(loader::Message::Progress { - n_entries_total, - n_entries_done: i + 1, - }); + self.send(loader::Message::Progress { n_total, n_done: i + 1 }); } self.config.sort_by(|x, y| x.0.cmp(&y.0)); } -- cgit v1.2.3 From 089ea36b2ecf5d7267f8a671c077357aad50b8e2 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 24 Jun 2020 17:11:07 +0200 Subject: Don't watch dirs if not asked to --- crates/vfs-notify/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/vfs-notify') diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs index 5b4978285..2e60fe23b 100644 --- a/crates/vfs-notify/src/lib.rs +++ b/crates/vfs-notify/src/lib.rs @@ -199,7 +199,7 @@ impl LoaderActor { let is_dir = entry.file_type().is_dir(); let is_file = entry.file_type().is_file(); let abs_path = AbsPathBuf::try_from(entry.into_path()).unwrap(); - if is_dir { + if is_dir && watch { self.watch(abs_path.clone()); } let rel_path = abs_path.strip_prefix(&path)?; -- cgit v1.2.3