hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-22 13:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Track watched paths in ImfsFetcher, exposed via ImfsDebug interface

Browse source
This commit is contained in:
Lucien Greathouse 2019-09-25 10:45:14 -07:00
parent c140823bea
commit b4a8dec68c
3 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/imfs/real_fetcher.rs
View file

@ -2,6 +2,7 @@
//! std::fs interface and notify as the file watcher.
use std::{
collections::HashSet,
fs, io,
path::{Path, PathBuf},
sync::mpsc,
@ -35,7 +36,13 @@ pub struct RealFetcher {
/// Thread handle to convert notify's mpsc channel messages into
/// crossbeam_channel messages.
_converter_thread: JoinHandle<()>,
/// The crossbeam receiver filled with events from the converter thread.
receiver: Receiver<ImfsEvent>,
/// All of the paths that the fetcher is watching, tracked here because
/// notify does not expose this information.
watched_paths: HashSet<PathBuf>,
}
impl RealFetcher {
@ -69,6 +76,7 @@ impl RealFetcher {
watcher,
_converter_thread: handle,
receiver,
watched_paths: HashSet::new(),
}
}
}
@ -132,8 +140,13 @@ impl ImfsFetcher for RealFetcher {
log::trace!("Watching path {}", path.display());
if let Some(watcher) = self.watcher.as_mut() {
if let Err(err) = watcher.watch(path, RecursiveMode::NonRecursive) {
log::warn!("Couldn't watch path {}: {:?}", path.display(), err);
match watcher.watch(path, RecursiveMode::NonRecursive) {
Ok(_) => {
self.watched_paths.insert(path.to_path_buf());
}
Err(err) => {
log::warn!("Couldn't watch path {}: {:?}", path.display(), err);
}
}
}
}
@ -142,6 +155,11 @@ impl ImfsFetcher for RealFetcher {
log::trace!("Stopped watching path {}", path.display());
if let Some(watcher) = self.watcher.as_mut() {
// Remove the path from our watched paths regardless of the outcome
// of notify's unwatch to ensure we drop old paths in the event of a
// rename.
self.watched_paths.remove(path);
if let Err(err) = watcher.unwatch(path) {
log::warn!("Couldn't unwatch path {}: {:?}", path.display(), err);
}
@ -151,4 +169,8 @@ impl ImfsFetcher for RealFetcher {
fn receiver(&self) -> Receiver<ImfsEvent> {
self.receiver.clone()
}
fn watched_paths(&self) -> Vec<&Path> {
self.watched_paths.iter().map(|v| v.as_path()).collect()
}
}