wip

src/cli/mod.rs

@@ -1,9 +1,9 @@
-use clap::Parser;
 use crate::Result;
+use clap::Parser;
 
-mod start;
 mod daemon;
 mod run;
+mod start;
 
 #[derive(Debug, clap::Parser)]
 struct Cli {

src/cli/run.rs

@@ -1,7 +1,7 @@
 use crate::{env, Result};
 use eyre::bail;
-use interprocess::local_socket::{GenericFilePath, ToFsName};
 use interprocess::local_socket::traits::tokio::Stream;
+use interprocess::local_socket::{GenericFilePath, ToFsName};
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt};
 use tokio::try_join;
 
@@ -25,8 +25,10 @@ impl Run {
         }
         dbg!(&self);
 
-        let conn =
-            interprocess::local_socket::tokio::Stream::connect(env::IPC_SOCK_PATH.clone().to_fs_name::<GenericFilePath>()?).await?;
+        let conn = interprocess::local_socket::tokio::Stream::connect(
+            env::IPC_SOCK_PATH.clone().to_fs_name::<GenericFilePath>()?,
+        )
+        .await?;
         let (recv, mut send) = conn.split();
         let mut read = tokio::io::BufReader::new(recv);
         let mut buffer = String::with_capacity(1024);

src/ipc/client.rs

@@ -0,0 +1 @@
+

src/ipc/mod.rs

@@ -1,2 +1,2 @@
 pub(crate) mod client;
-pub(crate) mod server;
+pub(crate) mod server;

src/ipc/server.rs

@@ -1,7 +1,7 @@
+use crate::{env, Result};
+use interprocess::local_socket::{GenericFilePath, ListenerOptions, Name, ToFsName};
 use std::path::Path;
 use tokio::fs;
-use interprocess::local_socket::{GenericFilePath, ListenerOptions, Name, ToFsName};
-use crate::{env, Result};
 
 pub async fn listen() -> Result<interprocess::local_socket::tokio::Listener> {
     let _ = fs::remove_file(&*env::IPC_SOCK_PATH).await;
@@ -13,4 +13,4 @@ pub async fn listen() -> Result<interprocess::local_socket::tokio::Listener> {
 fn fs_name(path: &Path) -> Result<Name> {
     let fs_name = path.clone().to_fs_name::<GenericFilePath>()?;
     Ok(fs_name)
-}
+}

src/main.rs

@@ -4,13 +4,13 @@ extern crate log;
 mod cli;
 mod daemon;
 mod env;
+mod ipc;
 mod logger;
-mod state_file;
 mod pitchfork_toml;
 mod procs;
+mod state_file;
 mod supervisor;
 mod ui;
-mod ipc;
 
 pub use eyre::Result;
 

src/state_file.rs

@@ -1,7 +1,7 @@
+use crate::Result;
 use std::collections::BTreeMap;
 use std::fmt::Debug;
 use std::path::{Path, PathBuf};
-use crate::Result;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct StateFile {

src/supervisor.rs

@@ -30,7 +30,10 @@ enum Event {
 
 impl Supervisor {
     pub fn new(pid_file: StateFile) -> Self {
-        Self { state_file: pid_file, last_run: time::Instant::now() }
+        Self {
+            state_file: pid_file,
+            last_run: time::Instant::now(),
+        }
     }
 
     pub async fn start(mut self) -> Result<()> {
@@ -39,7 +42,13 @@ impl Supervisor {
 
         let listener = ipc::server::listen().await?;
 
-        self.state_file.daemons.insert("pitchfork".to_string(), StateFileDaemon { pid, status: StateFileDaemonStatus::Running });
+        self.state_file.daemons.insert(
+            "pitchfork".to_string(),
+            StateFileDaemon {
+                pid,
+                status: StateFileDaemonStatus::Running,
+            },
+        );
         self.state_file.write()?;
 
         let (tx, mut rx) = channel(1);
@@ -65,14 +74,14 @@ impl Supervisor {
                             continue;
                         }
                     };
-                    
+
                     let mut recv = BufReader::new(&conn);
                     let mut send = &conn;
                     let mut buffer = String::with_capacity(1024);
                     let send = send.write_all(b"Hello, world!\n");
                     let recv = recv.read_line(&mut buffer);
                     try_join!(send, recv)?;
-                    
+
                     println!("Received: {}", buffer.trim());
                 }
             }
@@ -167,22 +176,27 @@ impl Supervisor {
 
     fn file_watch(&self, tx: Sender<Event>) -> Result<Debouncer<RecommendedWatcher>> {
         let h = tokio::runtime::Handle::current();
-        let mut debouncer = new_debouncer(Duration::from_secs(2), move |res: DebounceEventResult| {
-            let tx = tx.clone();
-            h.spawn(async move {
-                if let Ok(ev) = res {
-                    let paths = ev.into_iter().map(|e| e.path).collect();
-                    tx.send(Event::FileChange(paths)).await.unwrap();
-                }
-            });
-        })?;
+        let mut debouncer =
+            new_debouncer(Duration::from_secs(2), move |res: DebounceEventResult| {
+                let tx = tx.clone();
+                h.spawn(async move {
+                    if let Ok(ev) = res {
+                        let paths = ev.into_iter().map(|e| e.path).collect();
+                        tx.send(Event::FileChange(paths)).await.unwrap();
+                    }
+                });
+            })?;
 
-        debouncer.watcher().watch(&env::BIN_PATH, RecursiveMode::NonRecursive)?;
-        debouncer.watcher().watch(&self.state_file.path, RecursiveMode::NonRecursive)?;
+        debouncer
+            .watcher()
+            .watch(&env::BIN_PATH, RecursiveMode::NonRecursive)?;
+        debouncer
+            .watcher()
+            .watch(&self.state_file.path, RecursiveMode::NonRecursive)?;
 
         Ok(debouncer)
     }
-    
+
     fn interval_watch(&self, tx: Sender<Event>) -> Result<()> {
         let tx = tx.clone();
         tokio::spawn(async move {