actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error handling of extra-watch-dirs watching, fix not watching whitelisted files outside book root

This commit is contained in:
Will Crichton 2022-11-07 12:20:59 -08:00
parent fb0cbc90e3
commit 852a882fab
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/watch.rs
View File

@ -147,7 +147,11 @@ where
let _ = watcher.watch(book.root.join("book.toml"), NonRecursive); let _ = watcher.watch(book.root.join("book.toml"), NonRecursive);
for dir in &book.config.build.extra_watch_dirs { for dir in &book.config.build.extra_watch_dirs {
let _ = watcher.watch(dir, Recursive); let path = dir.canonicalize().unwrap();
if let Err(e) = watcher.watch(&path, Recursive) {
error!("Error while watching extra directory {path:?}:\n {e:?}");
std::process::exit(1);
}
} }
info!("Listening for changes..."); info!("Listening for changes...");
@ -170,7 +174,11 @@ where
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let paths = remove_ignored_files(&book.root, &paths[..]); // If we are watching files outside the current repository (via extra-watch-dirs), then they are definitionally
// ignored by gitignore. So we handle this case by including such files into the watched paths list.
let any_external_paths = paths.iter().filter(|p| !p.starts_with(&book.root)).cloned();
let mut paths = remove_ignored_files(&book.root, &paths[..]);
paths.extend(any_external_paths);
if !paths.is_empty() { if !paths.is_empty() {
closure(paths, &book.root); closure(paths, &book.root);