feat: support macOS

Closes kemitix/git-next#108

Cargo.toml

@@ -91,7 +91,7 @@ thiserror = "1.0"
 pike = "0.1"
 
 # file watcher
-inotify = "0.10"
+notify = "6.1"
 
 # Actors
 actix = "0.13"

crates/cli/Cargo.toml

@@ -65,7 +65,7 @@ bytes = { workspace = true }
 warp = { workspace = true }
 
 # file watcher (linux)
-inotify = { workspace = true }
+notify = { workspace = true }
 
 [dev-dependencies]
 # Testing

crates/cli/src/file_watcher.rs

@@ -2,15 +2,13 @@
 use actix::prelude::*;
 
 use actix::Recipient;
-use inotify::{EventMask, Inotify, WatchMask};
+use notify::event::ModifyKind;
+use notify::Watcher;
+use tracing::error;
+use tracing::info;
 
-use std::{path::PathBuf, time::Duration};
+use std::path::PathBuf;
-
+use std::time::Duration;
-const CHECK_INTERVAL: Duration = Duration::from_secs(1);
-
-#[derive(Debug, Clone, Message)]
-#[rtype(result = "()")]
-pub struct WatchFile;
 
 #[derive(Debug, Message)]
 #[rtype(result = "()")]
@@ -21,50 +19,40 @@ pub enum Error {
     #[error("io")]
     Io(#[from] std::io::Error),
 }
+pub async fn watch_file(path: PathBuf, recipient: Recipient<FileUpdated>) {
+    let (tx, rx) = std::sync::mpsc::channel();
 
-pub struct FileWatcher {
+    #[allow(clippy::expect_used)]
-    inotify: Inotify,
+    let mut handler = notify::recommended_watcher(tx).expect("file watcher");
-    recipient: Recipient<FileUpdated>,
+    #[allow(clippy::expect_used)]
-    run_interval: Option<SpawnHandle>,
+    handler
-}
+        .watch(&path, notify::RecursiveMode::NonRecursive)
-impl FileWatcher {
+        .expect("watch file");
-    pub fn new(path: PathBuf, recipient: Recipient<FileUpdated>) -> Result<Self, Error> {
+    info!("Watching: {:?}", path);
-        let inotify = Inotify::init()?;
+    async move {
-        inotify.watches().add(
+        loop {
-            path,
+            for result in rx.try_iter() {
-            WatchMask::MODIFY | WatchMask::CREATE | WatchMask::DELETE | WatchMask::ATTRIB,
+                match result {
-        )?;
+                    Ok(event) => match event.kind {
-        Ok(Self {
+                        notify::EventKind::Modify(ModifyKind::Data(_)) => {
-            inotify,
+                            tracing::info!("File modified");
-            recipient,
+                            recipient.do_send(FileUpdated);
-            run_interval: None,
+                            break;
-        })
+                        }
-    }
+                        notify::EventKind::Modify(_)
-}
+                        | notify::EventKind::Create(_)
-impl Actor for FileWatcher {
+                        | notify::EventKind::Remove(_)
-    type Context = Context<Self>;
+                        | notify::EventKind::Any
-
+                        | notify::EventKind::Access(_)
-    fn started(&mut self, ctx: &mut Self::Context) {
+                        | notify::EventKind::Other => { /* do nothing */ }
-        tracing::info!("Starting file watcher actor");
+                    },
-        self.run_interval
+                    Err(err) => {
-            .replace(ctx.run_interval(CHECK_INTERVAL, |_act, ctx| {
+                        error!(?err, "Watching file: {path:?}");
-                ctx.notify(WatchFile);
+                    }
-            }));
+                }
-    }
+            }
-}
+            actix_rt::time::sleep(Duration::from_millis(1000)).await;
-
-impl Handler<WatchFile> for FileWatcher {
-    type Result = ();
-
-    fn handle(&mut self, _msg: WatchFile, _ctx: &mut Self::Context) -> Self::Result {
-        let mut buffer = [0u8; 4096];
-        if let Ok(mut events) = self.inotify.read_events(&mut buffer) {
-            if events.any(|event| {
-                event.mask.contains(EventMask::MODIFY) || event.mask.contains(EventMask::ATTRIB)
-            }) {
-                tracing::info!("File modified");
-                self.recipient.do_send(FileUpdated);
-            };
         }
     }
+    .await;
 }

crates/cli/src/server/actor/mod.rs

@@ -243,6 +243,5 @@ impl ServerActor {
         }
         #[cfg(not(test))]
         _ctx.address().do_send(msg);
-        tracing::info!("sent");
     }
 }

crates/cli/src/server/mod.rs

@@ -6,12 +6,12 @@ mod tests;
 
 use actix::prelude::*;
 
-use crate::file_watcher::{FileUpdated, FileWatcher};
+use crate::file_watcher::{watch_file, FileUpdated};
 use actor::ServerActor;
 use git_next_core::git::RepositoryFactory;
 
 use kxio::{fs::FileSystem, network::Network};
-use tracing::{error, info, level_filters::LevelFilter};
+use tracing::{info, level_filters::LevelFilter};
 
 use std::path::PathBuf;
 
@@ -45,20 +45,13 @@ pub fn start(
 ) {
     init_logging();
 
-    info!("Starting Server...");
     let execution = async move {
+        info!("Starting Server...");
         let server = ServerActor::new(fs.clone(), net.clone(), repo, sleep_duration).start();
         server.do_send(FileUpdated);
 
         info!("Starting File Watcher...");
-        let fw = match FileWatcher::new("git-next-server.toml".into(), server.clone().recipient()) {
+        watch_file("git-next-server.toml".into(), server.clone().recipient()).await;
-            Ok(fw) => fw,
-            Err(err) => {
-                error!(?err, "Failed to start file watcher");
-                return;
-            }
-        };
-        fw.start();
 
         info!("Server running - Press Ctrl-C to stop...");
         let _ = actix_rt::signal::ctrl_c().await;