Merge pull request #274 from RustCastLabs/hotkey-sleep-fix

Hotkey sleep fix

Author: unsecretised

src/app.rs

@@ -118,6 +118,7 @@ pub enum Message {
     FileSearchClear,
     SetFileSearchSender(tokio::sync::watch::Sender<(String, Vec<String>)>),
     DebouncedSearch(Id),
+    CheckEventTap,
 }
 
 #[derive(Debug, Clone)]

src/app/tile.rs

@@ -266,6 +266,7 @@ impl Tile {
             Subscription::run(handle_recipient),
             Subscription::run(reload_events),
             Subscription::run(handle_version_and_rankings),
+            Subscription::run(check_event_tap),
             Subscription::run(handle_clipboard_history),
             Subscription::run(handle_file_search),
             window::close_events().map(Message::HideWindow),
@@ -794,6 +795,15 @@ fn reload_events() -> impl futures::Stream<Item = Message> {
     })
 }
 
+fn check_event_tap() -> impl futures::Stream<Item = Message> {
+    stream::channel(100, async |mut output| {
+        loop {
+            tokio::time::sleep(Duration::from_secs(5)).await;
+            output.send(Message::CheckEventTap).await.ok();
+        }
+    })
+}
+
 fn handle_version_and_rankings() -> impl futures::Stream<Item = Message> {
     stream::channel(100, async |mut output| {
         loop {

src/app/tile/update.rs

@@ -32,7 +32,6 @@ use crate::app::menubar::menu_icon;
 use crate::app::tile::AppIndex;
 use crate::app::{Message, Page, tile::Tile};
 use crate::autoupdate::download_latest_app;
-use crate::autoupdate::relaunch_app;
 use crate::calculator::Expr;
 use crate::commands::Function;
 use crate::config::Config;
@@ -154,7 +153,6 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             if tile.config.auto_update {
                 thread::spawn(|| {
                     download_latest_app().ok();
-                    relaunch_app();
                 });
             }
             Task::done(Message::ReloadConfig)
@@ -948,6 +946,18 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             Task::none()
         }
 
+        Message::CheckEventTap => {
+            info!("Re-creating global event tap");
+            if let Some(ref sender) = tile.sender {
+                tile.hotkeys.handle = None;
+                match global_handler(sender.clone(), tile.hotkeys.all_hotkeys()) {
+                    Ok(handle) => tile.hotkeys.handle = Some(handle),
+                    Err(e) => log::error!("Failed to re-create event tap: {e}"),
+                }
+            }
+            Task::none()
+        }
+
         Message::DebouncedSearch(id) => {
             // Only execute if this is still the most recent debounce timer
             if !tile.debouncer.is_ready() {

src/autoupdate.rs

@@ -188,27 +188,6 @@ fn copy_dir_recursive(src: &std::path::Path, dst: &std::path::Path) -> std::io::
     Ok(())
 }
 
-pub fn relaunch_app() {
-    let app_path = match get_app_path() {
-        Some(p) => p,
-        None => {
-            error!("Could not determine current app path for relaunch");
-            return;
-        }
-    };
-
-    match std::process::Command::new("open").arg(&app_path).spawn() {
-        Ok(_) => {
-            info!("Relaunching app at {:?}", app_path);
-            std::thread::sleep(std::time::Duration::from_millis(500));
-            std::process::exit(0);
-        }
-        Err(e) => {
-            error!("Could not relaunch app: {e}");
-        }
-    }
-}
-
 pub fn get_app_path() -> Option<std::path::PathBuf> {
     let exe = std::env::current_exe().ok()?;