add watcher for shortcuts changes for COSMIC, fixes #21

Author: l-const

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "shortcuts-overlay"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "A keyboard shortcuts overlay for the COSMIC DE and other Wayland compositors"

Cargo.toml

@@ -61,13 +61,19 @@ fn main() -> Result<()> {
 
     // watcher code
     let state_clone = Arc::clone(&state);
-    let handle = std::thread::spawn(|| {
+    let watch_config_handle = std::thread::spawn(|| {
         watcher::watch_overlay_config(state_clone).unwrap();
     });
+    let state_clone_keybindings = Arc::clone(&state);
+    let watch_shortcuts_handle = std::thread::spawn(|| {
+        watcher::watch_shortcuts(state_clone_keybindings, xdg_desktop).unwrap();
+    });
+
     // start
     overlay::start(state)?;
 
-    handle.join().unwrap();
+    watch_config_handle.join().unwrap();
+    watch_shortcuts_handle.join().unwrap();
 
     Ok(())
 }

src/main.rs

@@ -1,9 +1,12 @@
+use crate::keybinding_reader::load_cosmic_shortcuts;
 use crate::state::State;
+use crate::util::XDGDesktop;
 use notify::{Event, RecursiveMode, Result, Watcher};
 use std::sync::Arc;
 use std::{path::Path, sync::mpsc};
 
 const OVERLAY_CONFIG_FILE: &str = "/usr/share/shortcuts-overlay/overlay-config.toml";
+const COSMIC_SHORTCUTS_DIR: &str = ".config/cosmic/com.system76.CosmicSettings.Shortcuts/";
 
 pub(crate) fn watch_overlay_config(state: Arc<State>) -> Result<()> {
     let (tx, rx) = mpsc::channel::<Result<Event>>();
@@ -28,3 +31,33 @@ pub(crate) fn watch_overlay_config(state: Arc<State>) -> Result<()> {
 
     Ok(())
 }
+
+pub(crate) fn watch_shortcuts(state: Arc<State>, desktop: XDGDesktop) -> Result<()> {
+    let (tx, rx) = mpsc::channel::<Result<Event>>();
+
+    let mut watcher = notify::recommended_watcher(tx)?;
+
+    let path = match desktop {
+        XDGDesktop::COSMIC => dirs::home_dir().unwrap().join(COSMIC_SHORTCUTS_DIR),
+        XDGDesktop::NIRI => unimplemented!(),
+    };
+
+    // Add a path to be watched. All files and directories at that path and
+    // below will be monitored for changes.
+    watcher.watch(&path, RecursiveMode::Recursive)?;
+    // Block forever, printing out events as they come in
+    for res in rx {
+        match res {
+            Ok(event) => {
+                log::debug!("event: {:?}", event);
+                if event.kind.is_modify() {
+                    let shortcuts = load_cosmic_shortcuts().unwrap_or_default();
+                    state._set_keybindings(shortcuts);
+                }
+            }
+            Err(e) => log::error!("watch error: {:?}", e),
+        }
+    }
+
+    Ok(())
+}