Merge pull request #43 from Avimitin/reload-config

Add reload config ability

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

daemon/src/ipc_server.rs

@@ -120,6 +120,11 @@ fn handle_message(buffer: &mut String, ustream: UnixStream, wpaperd: &mut Wpaper
 
             IpcResponse::Ok
         }),
+
+        IpcMessage::ReloadConfig => {
+            wpaperd.reload_config()?;
+            Ok(IpcResponse::Ok)
+        }
     };
 
     let mut stream = BufWriter::new(ustream);

daemon/src/wallpaper_config.rs

@@ -10,7 +10,7 @@ use serde::Deserialize;
 
 use crate::wallpaper_info::WallpaperInfo;
 
-#[derive(Deserialize, PartialEq)]
+#[derive(Deserialize)]
 pub struct WallpaperConfig {
     #[serde(flatten)]
     data: HashMap<String, Arc<WallpaperInfo>>,
@@ -53,3 +53,9 @@ Either remove `duration` or set `path` to a directory"
         self.data.get(name).unwrap_or(&self.default_config).clone()
     }
 }
+
+impl PartialEq for WallpaperConfig {
+    fn eq(&self, other: &Self) -> bool {
+        self.data == other.data
+    }
+}

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,30 @@ 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 !(*wallpaper_config == config) {
+                    *wallpaper_config = config;
+                    log::info!("Configuration updated");
+                }
+                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)]