✨ - handle ctrl-c

Author: jfrolich

Cargo.lock

@@ -11,7 +11,10 @@ serde_json = { version = "1.0.93" }
 ahash = "0.8.3"
 convert_case = "0.6.0"
 rayon = "1.6.1"
-log = { version = "0.4.17", features = ["max_level_debug", "release_max_level_warn"] }
+log = { version = "0.4.17", features = [
+    "max_level_debug",
+    "release_max_level_warn",
+] }
 env_logger = "0.10.0"
 indicatif = "0.17.3"
 console = "0.15.5"
@@ -22,6 +25,7 @@ futures = "0.3.25"
 futures-timer = "3.0.2"
 clap = { version = "4.3.17", features = ["derive"] }
 sysinfo = "0.29.10"
+ctrlc = "3.4.4"
 
 
 [profile.release]

Cargo.toml

@@ -1,5 +1,6 @@
 use crate::build;
 use crate::build::build_types::SourceType;
+use crate::build::clean;
 use crate::cmd;
 use crate::helpers;
 use crate::helpers::emojis::*;
@@ -10,6 +11,7 @@ use notify::event::ModifyKind;
 use notify::{Config, Error, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::time::{Duration, Instant};
 
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
@@ -52,9 +54,25 @@ async fn async_watch(
 ) -> notify::Result<()> {
     let mut build_state = build::initialize_build(None, filter, path).expect("Can't initialize build");
     let mut needs_compile_type = CompileType::Incremental;
+    // create a mutex to capture if ctrl-c was pressed
+    let ctrlc_pressed = Arc::new(Mutex::new(false));
+    let ctrlc_pressed_clone = Arc::clone(&ctrlc_pressed);
+
+    ctrlc::set_handler(move || {
+        let pressed = Arc::clone(&ctrlc_pressed);
+        let mut pressed = pressed.lock().unwrap();
+        *pressed = true;
+    })
+    .expect("Error setting Ctrl-C handler");
+
     let mut initial_build = true;
 
     loop {
+        if *ctrlc_pressed_clone.lock().unwrap() {
+            println!("\nExiting...");
+            clean::cleanup_after_build(&build_state);
+            break Ok(());
+        }
         let mut events: Vec<Event> = vec![];
         if !q.is_empty() {
             // Wait for events to settle