debounce notify events

kitsune-soc · Nov 30, 2024 · a645fdc · a645fdc
1 parent 7aa9060
commit a645fdc
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -71,7 +71,7 @@ mimalloc = "0.1.43"
 mime = "0.3.17"
 mime_guess = { version = "2.0.5", default-features = false }
 minijinja.workspace = true
-notify = "7.0.0"
+notify-debouncer-full = "0.4.0"
 oxide-auth = "0.6.1"
 oxide-auth-async = "0.2.1"
 oxide-auth-axum = "0.5.0"

diff --git a/kitsune/src/template.rs b/kitsune/src/template.rs
@@ -1,8 +1,8 @@
 use arc_swap::ArcSwapAny;
 use core::str;
-use notify::Watcher;
+use notify_debouncer_full::notify;
 use rust_embed::RustEmbed;
-use std::{mem::ManuallyDrop, path::Path, sync::OnceLock};
+use std::{mem::ManuallyDrop, path::Path, sync::OnceLock, time::Duration};
 use triomphe::Arc;
 
 static ENVIRONMENT: OnceLock<ArcSwapAny<Arc<minijinja::Environment<'static>>>> = OnceLock::new();
@@ -30,28 +30,33 @@ fn init_environment() -> minijinja::Environment<'static> {
 }
 
 fn spawn_watcher() {
-    let watcher = notify::recommended_watcher(|event: notify::Result<notify::Event>| {
-        if event.is_err() {
-            return;
-        }
+    let watcher = notify_debouncer_full::new_debouncer(
+        Duration::from_secs(1),
+        None,
+        |events: notify_debouncer_full::DebounceEventResult| {
+            let Ok(events) = events else {
+                return;
+            };
 
-        match event {
-            Ok(notify::Event {
-                kind:
-                    notify::EventKind::Create(..)
-                    | notify::EventKind::Modify(..)
-                    | notify::EventKind::Remove(..),
-                ..
-            }) => {
-                debug!("reloading templates");
+            for event in events {
+                if matches!(
+                    event.event,
+                    notify::Event {
+                        kind: notify::EventKind::Create(..)
+                            | notify::EventKind::Modify(..)
+                            | notify::EventKind::Remove(..),
+                        ..
+                    }
+                ) {
+                    debug!("reloading templates");
 
-                if let Some(env) = ENVIRONMENT.get() {
-                    env.store(Arc::new(init_environment()));
+                    if let Some(env) = ENVIRONMENT.get() {
+                        env.store(Arc::new(init_environment()));
+                    }
                 }
             }
-            _ => return,
-        }
-    })
+        },
+    )
     .unwrap();
 
     let mut watcher = ManuallyDrop::new(watcher);