easy

0-don · Oct 6, 2023 · c17c786 · c17c786
1 parent 38f2206
commit c17c786
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 25 deletions.
diff --git a/src-tauri/src/commands/hotkey.rs b/src-tauri/src/commands/hotkey.rs
@@ -1,9 +1,9 @@
 use crate::{
-    service::{
-        hotkey::{get_all_hotkeys_db, update_hotkey_db},
-        window::init_event,
+    service::hotkey::{get_all_hotkeys_db, update_hotkey_db},
+    utils::hotkey::{
+        hotkey_listener::init_hotkey_listener,
+        hotkey_manager::{register_hotkeys, unregister_hotkeys},
     },
-    utils::hotkey::hotkey_manager::unregister_hotkeys,
 };
 use entity::hotkey::Model;
 
@@ -18,7 +18,7 @@ pub async fn get_hotkeys() -> Result<Vec<Model>, String> {
 pub async fn update_hotkey(hotkey: Model) -> Result<Model, String> {
     let res = update_hotkey_db(hotkey).await;
 
-    init_event();
+    init_hotkey_listener(false);
 
     Ok(res.unwrap())
 }
@@ -27,3 +27,8 @@ pub async fn update_hotkey(hotkey: Model) -> Result<Model, String> {
 pub async fn stop_hotkeys() -> Result<(), String> {
     Ok(unregister_hotkeys(false))
 }
+
+#[tauri::command]
+pub async fn start_hotkeys() -> Result<(), String> {
+    Ok(register_hotkeys(true))
+}
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
@@ -1,9 +1,6 @@
 use entity::settings::Model;
 
-use crate::service::{
-    settings::{get_settings_db, update_settings_db},
-    window::init_event,
-};
+use crate::{service::settings::{get_settings_db, update_settings_db}, utils::hotkey::hotkey_listener::init_hotkey_listener};
 
 #[tauri::command]
 pub async fn get_settings() -> Result<Model, String> {
@@ -16,7 +13,7 @@ pub async fn get_settings() -> Result<Model, String> {
 pub async fn update_settings(settings: Model) -> Result<Model, String> {
     let res = update_settings_db(settings).await;
 
-    init_event();
+    init_hotkey_listener(false);
 
     Ok(res.unwrap())
 }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -33,6 +33,7 @@ async fn main() {
             hotkey::get_hotkeys,
             hotkey::update_hotkey,
             hotkey::stop_hotkeys,
+            hotkey::start_hotkeys,
             settings::get_settings,
             settings::update_settings,
             window::window_display_toggle,

diff --git a/src-tauri/src/service/window.rs b/src-tauri/src/service/window.rs
@@ -11,15 +11,6 @@ use crate::{
     utils::{hotkey::hotkey_listener::init_hotkey_listener, setup::APP},
 };
 
-pub fn init_event() {
-    APP.get()
-        .unwrap()
-        .get_window("main")
-        .unwrap()
-        .emit("init_listener", Some(()))
-        .unwrap();
-}
-
 pub fn get_main_window() -> Window {
     APP.get().unwrap().get_window("main").unwrap()
 }

diff --git a/src-tauri/src/utils/hotkey/hotkey_listener.rs b/src-tauri/src/utils/hotkey/hotkey_listener.rs
@@ -59,6 +59,8 @@ pub async fn parse_hotkey_event(key: &Key) {
 
     let window = APP.get().unwrap().get_window("main").unwrap();
 
+    println!("event: {:?}", event);
+
     match event {
         Ok(HotkeyEvent::WindowDisplayToggle) => toggle_main_window(),
         Ok(HotkeyEvent::TypeClipboard) => type_last_clipboard().await,

diff --git a/src-tauri/src/utils/hotkey/hotkey_manager.rs b/src-tauri/src/utils/hotkey/hotkey_manager.rs
@@ -1,15 +1,13 @@
 use crate::{
     service::hotkey::get_all_hotkeys_db,
     types::types::Key,
-    utils::setup::{APP, GLOBAL_EVENTS, HOTKEYS, HOTKEY_MANAGER},
+    utils::setup::{GLOBAL_EVENTS, HOTKEYS, HOTKEY_MANAGER},
 };
 use global_hotkey::hotkey::HotKey;
-use tauri::Manager;
 
 pub fn register_hotkeys(all: bool) {
     let hotkeys_store = HOTKEYS.get().unwrap().lock().unwrap();
     let hotkey_manager = HOTKEY_MANAGER.get().unwrap();
-    let window = APP.get().unwrap().get_window("main").unwrap();
 
     for (_, hotkey) in hotkeys_store.iter() {
         if all || hotkey.global {
@@ -26,9 +24,7 @@ pub fn unregister_hotkeys(all: bool) {
     let hotkey_manager = HOTKEY_MANAGER.get().unwrap();
 
     for (_, hotkey) in hotkeys_store.iter() {
-        if all {
-            hotkey_manager.unregister(hotkey.hotkey.clone()).unwrap();
-        } else if !hotkey.global {
+        if all || !hotkey.global {
             hotkey_manager.unregister(hotkey.hotkey.clone()).unwrap();
         }
     }