Implement reload command

Fixes #47.

cli/src/main.rs

@@ -26,6 +26,7 @@ fn main() {
         }
         SubCmd::NextWallpaper { monitors } => IpcMessage::NextWallpaper { monitors },
         SubCmd::PreviousWallpaper { monitors } => IpcMessage::PreviousWallpaper { monitors },
+        SubCmd::ReloadWallpaper { monitors } => IpcMessage::ReloadWallpaper { monitors },
     };
     conn.write_all(&serde_json::to_vec(&msg).unwrap()).unwrap();
     let mut buf = String::new();

cli/src/opts.rs

@@ -20,4 +20,6 @@ pub enum SubCmd {
     NextWallpaper { monitors: Vec<String> },
     #[clap(visible_alias = "previous")]
     PreviousWallpaper { monitors: Vec<String> },
+    #[clap(visible_alias = "reload")]
+    ReloadWallpaper { monitors: Vec<String> },
 }

daemon/src/image_picker.rs

@@ -136,6 +136,7 @@ pub struct ImagePicker {
     action: Option<ImagePickerAction>,
     sorting: ImagePickerSorting,
     filelist_cache: Rc<RefCell<FilelistCache>>,
+    reload: bool,
 }
 
 impl ImagePicker {
@@ -153,6 +154,7 @@ impl ImagePicker {
                 Sorting::Descending => ImagePickerSorting::Descending(usize::MAX),
             },
             filelist_cache,
+            reload: false,
         }
     }
 
@@ -274,7 +276,7 @@ impl ImagePicker {
                     Some((img_path, index))
                 }
             }
-        } else if path == self.current_img {
+        } else if path == self.current_img && !self.reload {
             None
         } else {
             // path is not a directory and it's not the current image
@@ -367,6 +369,21 @@ impl ImagePicker {
             ImagePickerSorting::Ascending(_) | ImagePickerSorting::Descending(_) => {}
         }
     }
+
+    #[inline]
+    pub fn reload(&mut self) {
+        self.reload = true;
+    }
+
+    #[inline]
+    pub fn reloaded(&mut self) {
+        self.reload = false;
+    }
+
+    #[inline]
+    pub fn is_reloading(&self) -> bool {
+        self.reload
+    }
 }
 
 #[cfg(test)]

daemon/src/ipc_server.rs

@@ -121,6 +121,14 @@ pub fn handle_message(
                 surface.queue_draw(&qh);
             }
 
+            IpcResponse::Ok
+        }),
+        IpcMessage::ReloadWallpaper { monitors } => check_monitors(wpaperd, &monitors).map(|_| {
+            for surface in collect_surfaces(wpaperd, monitors) {
+                surface.image_picker.reload();
+                surface.queue_draw(&qh);
+            }
+
             IpcResponse::Ok
         }),
     };

daemon/src/surface.rs

@@ -169,7 +169,11 @@ impl Surface {
                     self.renderer
                         .load_wallpaper(data.into(), self.wallpaper_info.mode)?;
                     self.renderer.start_transition(time);
-                    self.image_picker.update_current_image(image_path, index);
+                    if self.image_picker.is_reloading() {
+                        self.image_picker.reloaded();
+                    } else {
+                        self.image_picker.update_current_image(image_path, index);
+                    }
                     // Restart the counter
                     self.loading_image_tries = 0;
                     self.loading_image = None;

ipc/src/lib.rs

@@ -9,6 +9,7 @@ pub enum IpcMessage {
     NextWallpaper { monitors: Vec<String> },
     PreviousWallpaper { monitors: Vec<String> },
     AllWallpapers,
+    ReloadWallpaper { monitors: Vec<String> },
 }
 
 #[derive(Serialize, Deserialize)]