Add Ctrl/Cmd+C support (#14)

* Add support for Ctrl/Cmd+C to cancel and exit.
emilevr · Feb 15, 2024 · abb0cfb · abb0cfb
1 parent 52515fb
commit abb0cfb
Show file tree

Hide file tree

Showing 14 changed files with 329 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,6 +57,7 @@ anyhow = "^1.0.72"
 clap = { version = "=4.4.6", optional = true }
 criterion = { version = "^0.5.1", default-features = false, features = [], optional = true }
 crossterm = { version = "^0.27.0", optional = true }
+ctrlc = { version = "3.4.2", features = ["termination"] }
 dirs = { version = "^5.0.1", optional = true }
 log = { version = "^0.4.20", optional = true }
 log4rs = { version = "^1.2.0", optional = true }

diff --git a/benches/directory_item_build.rs b/benches/directory_item_build.rs
@@ -1,16 +1,21 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use space_rs::DirectoryItem;
-use std::path::Path;
+use std::{
+    path::Path,
+    sync::{atomic::AtomicBool, Arc},
+};
 
 const DIRECTORY_PATH: &str = "./tmp.sample";
 
 pub fn directory_item_build(c: &mut Criterion) {
     let path = &Path::new(DIRECTORY_PATH).to_path_buf();
+    let should_exit = Arc::new(AtomicBool::new(false));
+
     c.bench_function(
         &format!("DirectoryItem::build() on {}", path.display()),
         |b| {
             b.iter(|| {
-                black_box(DirectoryItem::build(vec![path.clone()]));
+                black_box(DirectoryItem::build(vec![path.clone()], &should_exit));
             })
         },
     );

diff --git a/benches/directory_item_build_x2.rs b/benches/directory_item_build_x2.rs
@@ -1,6 +1,9 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use space_rs::DirectoryItem;
-use std::path::Path;
+use std::{
+    path::Path,
+    sync::{atomic::AtomicBool, Arc},
+};
 
 const DIRECTORY_PATH: &str = "./tmp.sample";
 
@@ -16,11 +19,13 @@ pub fn directory_item_build_x2(c: &mut Criterion) {
         .build_global()
         .unwrap();
 
+    let should_exit = Arc::new(AtomicBool::new(false));
+
     c.bench_function(
         &format!("DirectoryItem::build() x2 on {}", path.display()),
         |b| {
             b.iter(|| {
-                black_box(DirectoryItem::build(vec![path.clone()]));
+                black_box(DirectoryItem::build(vec![path.clone()], &should_exit));
             })
         },
     );