ctrlc

Author: Jxtopher

Cargo.toml

@@ -12,6 +12,7 @@ version = "0.0.0-git"
 chrono = "0.4.33"
 clap = { version = "4.4.18", features = ["derive"] }
 crossterm = "0.29.0"
+ctrlc = "3.4.7"
 env_logger = "0.11.8"
 log = "0.4.20"
 tempfile = "3.20.0"

src/main.rs

@@ -3,9 +3,14 @@ mod thread_pool;
 
 use chrono::Utc;
 use clap::Parser;
+use ctrlc;
 use log::{error, info};
-use std::fs::{self, metadata, File};
+use std::fs::{self, File};
 use std::path::PathBuf;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
 use std::thread;
 use std::time::Duration;
 
@@ -36,6 +41,16 @@ fn main() -> Result<(), std::io::Error> {
     env_logger::init();
     let args = Args::parse();
 
+    let running = Arc::new(AtomicBool::new(true));
+    {
+        let running = Arc::clone(&running);
+        ctrlc::set_handler(move || {
+            running.store(false, Ordering::SeqCst);
+            println!("\nReceived interruption (Ctrl+C), shutting down gracefully...");
+        })
+        .expect("Error setting up Ctrl+C handler");
+    }
+
     let mut has_tasks: bool = true;
     let mut thread_pool: ThreadPool = ThreadPool::new(args.jobs);
 
@@ -58,7 +73,7 @@ fn main() -> Result<(), std::io::Error> {
         print!("{thread_pool}");
     }
 
-    while args.demon || has_tasks {
+    while (args.demon || has_tasks) && running.load(Ordering::SeqCst) {
         if is_dir {
             history_file = backlog_path.join("qrun_history.log");
             let mut found_file = false;
@@ -90,18 +105,15 @@ fn main() -> Result<(), std::io::Error> {
 
         if let Some(file) = &backlog_file {
             if file.exists() {
-                // Read the backlog
                 let mut tasks = rw_file::read(&file);
 
-                while !tasks.is_empty() {
+                while !tasks.is_empty() && running.load(Ordering::SeqCst) {
                     while thread_pool.has_one_available() && !tasks.is_empty() {
                         let thread_id = thread_pool.get_one_available();
                         if let Some(thread_id) = thread_id {
                             let task = tasks[0].to_string();
                             tasks.remove(0);
-                            // println!("{} - {}", thread_id, &task);
                             rw_file::append(&history_file, &task)?;
-
                             thread_pool.exec_task(thread_id, task, log_file.try_clone()?);
                         }
                     }
@@ -115,7 +127,7 @@ fn main() -> Result<(), std::io::Error> {
                     thread::sleep(Duration::from_secs(1));
                 }
 
-                while thread_pool.is_ongoing() {
+                while thread_pool.is_ongoing() && running.load(Ordering::SeqCst) {
                     if !args.demon {
                         print!("{thread_pool}");
                     }
@@ -125,8 +137,11 @@ fn main() -> Result<(), std::io::Error> {
                     thread::sleep(Duration::from_secs(1));
                 }
 
-                // rw_file::write(&file, &tasks)?;
-                fs::remove_file(file)?;
+                if !tasks.is_empty() {
+                    rw_file::write(&file, &tasks)?;
+                } else {
+                    fs::remove_file(file)?;
+                }
                 has_tasks = false;
             }
         }