diff --git a/src/commands/build/watch/mod.rs b/src/commands/build/watch/mod.rs index 4bed4832c..0026182a2 100644 --- a/src/commands/build/watch/mod.rs +++ b/src/commands/build/watch/mod.rs @@ -14,6 +14,7 @@ use std::thread; use std::time::Duration; pub const COOLDOWN_PERIOD: Duration = Duration::from_millis(2000); +const JAVASCRIPT_PATH: &str = "./"; /// watch a project for changes and re-build it when necessary, /// outputting a build event to tx. @@ -24,14 +25,14 @@ pub fn watch_and_build( let project_type = &project.project_type; match project_type { ProjectType::JavaScript => { - let package = Package::new("./")?; - let entry = package.main()?; thread::spawn(move || { let (watcher_tx, watcher_rx) = mpsc::channel(); let mut watcher = notify::watcher(watcher_tx, Duration::from_secs(1)).unwrap(); - watcher.watch(&entry, RecursiveMode::Recursive).unwrap(); - message::info(&format!("watching {:?}", &entry)); + watcher + .watch(JAVASCRIPT_PATH, RecursiveMode::Recursive) + .unwrap(); + message::info(&format!("watching {:?}", &JAVASCRIPT_PATH)); loop { match wait_for_changes(&watcher_rx, COOLDOWN_PERIOD) { diff --git a/src/commands/build/watch/watcher.rs b/src/commands/build/watch/watcher.rs index cddf1fa47..49f260df1 100644 --- a/src/commands/build/watch/watcher.rs +++ b/src/commands/build/watch/watcher.rs @@ -8,7 +8,7 @@ use failure::{format_err, Error}; use crate::terminal::message; use log::info; -///Add cooldown for all types of events to watching logic +/// Add cooldown for all types of events to watching logic pub fn wait_for_changes( rx: &Receiver, cooldown: Duration, @@ -18,15 +18,12 @@ pub fn wait_for_changes( match get_changed_path_from_event(event) { Ok(Some(path)) => { message::working("Detected changes..."); - //wait for cooldown - while let Ok(_) = rx.recv_timeout(cooldown) { - message::working("Detected change during cooldown..."); - } - message::working("Cooldown over, propogating changes..."); + // wait for cooldown + while let Ok(_) = rx.recv_timeout(cooldown) {} return Ok(path); } Ok(None) => { - continue; //was an event type we don't care about, continue + continue; // was an event type we don't care about, continue } Err(error) => { message::user_error(&format!("WatchError {:?}", error));