Add reload config ability

Signed-off-by: Avimitin <[email protected]>

cli/src/main.rs

@@ -20,6 +20,7 @@ enum SubCmd {
     AllWallpapers,
     NextWallpaper { monitors: Vec<String> },
     PreviousWallpaper { monitors: Vec<String> },
+    ReloadConfig,
 }
 
 fn main() {
@@ -31,6 +32,7 @@ fn main() {
         SubCmd::AllWallpapers => IpcMessage::AllWallpapers,
         SubCmd::NextWallpaper { monitors } => IpcMessage::NextWallpaper { monitors },
         SubCmd::PreviousWallpaper { monitors } => IpcMessage::PreviousWallpaper { monitors },
+        SubCmd::ReloadConfig => IpcMessage::ReloadConfig,
     };
     conn.write_all(&serde_json::to_vec(&msg).unwrap()).unwrap();
     // Add a new line after the message
@@ -46,12 +48,15 @@ fn main() {
                     println!("{monitor}: {path:?}");
                 }
             }
-            IpcResponse::Ok => (),
+            IpcResponse::Ok => println!("daemon response: OK"),
         },
         Err(err) => match err {
             IpcError::MonitorNotFound { monitor } => {
                 eprintln!("monitor {monitor} could not be found")
             }
+            IpcError::Other { error } => {
+                eprintln!("{error}")
+            }
         },
     }
 }

daemon/src/ipc_server.rs

@@ -120,6 +120,13 @@ fn handle_message(buffer: &mut String, ustream: UnixStream, wpaperd: &mut Wpaper
 
             IpcResponse::Ok
         }),
+
+        IpcMessage::ReloadConfig => {
+            wpaperd.reload_config().map(|_| IpcResponse::Ok)?;
+            // Force update
+            wpaperd.surfaces.iter_mut().for_each(|sur| sur.next_image());
+            Ok(IpcResponse::Ok)
+        }
     };
 
     let mut stream = BufWriter::new(ustream);

daemon/src/wpaperd.rs

@@ -1,5 +1,6 @@
 use std::sync::{Arc, Mutex};
 
+use color_eyre::eyre::Context;
 use color_eyre::Result;
 use smithay_client_toolkit::compositor::{CompositorHandler, CompositorState};
 use smithay_client_toolkit::output::{OutputHandler, OutputState};
@@ -50,6 +51,32 @@ impl Wpaperd {
             use_scaled_window,
         })
     }
+
+    pub fn reload_config(&mut self) -> Result<()> {
+        let mut wallpaper_config = self.wallpaper_config.lock().unwrap();
+        let new_config =
+            WallpaperConfig::new_from_path(&wallpaper_config.path).with_context(|| {
+                format!(
+                    "reading configuration from file {:?}",
+                    wallpaper_config.path
+                )
+            });
+        match new_config {
+            Ok(config) => {
+                if config != *wallpaper_config {
+                    *wallpaper_config = config;
+                    println!("Configuration updated");
+                } else {
+                    println!("Configuration unchanged");
+                }
+                Ok(())
+            }
+            Err(err) => {
+                log::error!("{:?}", err);
+                Err(err)
+            }
+        }
+    }
 }
 
 impl CompositorHandler for Wpaperd {

ipc/src/lib.rs

@@ -9,6 +9,7 @@ pub enum IpcMessage {
     NextWallpaper { monitors: Vec<String> },
     PreviousWallpaper { monitors: Vec<String> },
     AllWallpapers,
+    ReloadConfig,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -21,6 +22,7 @@ pub enum IpcResponse {
 #[derive(Serialize, Deserialize, Debug)]
 pub enum IpcError {
     MonitorNotFound { monitor: String },
+    Other { error: String },
 }
 
 pub fn socket_path() -> Result<PathBuf, BaseDirectoriesError> {