refactor: global shortcut

src-tauri/src/app/cmd.rs

@@ -88,8 +88,17 @@ pub fn parse_prompt(data: String) -> Vec<PromptRecord> {
     let mut rdr = csv::Reader::from_reader(data.as_bytes());
     let mut list = vec![];
     for result in rdr.deserialize() {
-        let record: PromptRecord = result.unwrap();
-        list.push(record);
+        let record: PromptRecord = result.unwrap_or_else(|err| {
+            info!("parse_prompt_error: {}", err);
+            PromptRecord {
+                cmd: None,
+                act: "".to_string(),
+                prompt: "".to_string(),
+            }
+        });
+        if !record.act.is_empty() {
+            list.push(record);
+        }
     }
     list
 }
@@ -222,19 +231,22 @@ pub async fn sync_prompts(app: AppHandle, time: u64) -> Option<Vec<ModelRecord>>
 
 #[command]
 pub async fn sync_user_prompts(url: String, data_type: String) -> Option<Vec<ModelRecord>> {
-    let res = utils::get_data(&url, None).await.unwrap();
+    let res = utils::get_data(&url, None).await.unwrap_or_else(|err| {
+        info!("chatgpt_http_error: {}", err);
+        None
+    });
 
     info!("chatgpt_http_url: {}", url);
 
     if let Some(v) = res {
         let data;
         if data_type == "csv" {
-            info!("chatgpt_http_csv_parser");
+            info!("chatgpt_http_csv_parse");
             data = parse_prompt(v);
         } else if data_type == "json" {
-            info!("chatgpt_http_json_parser");
+            info!("chatgpt_http_json_parse");
             data = serde_json::from_str(&v).unwrap_or_else(|err| {
-                info!("chatgpt_http_json_parser_error: {}", err);
+                info!("chatgpt_http_json_parse_error: {}", err);
                 vec![]
             });
         } else {

src-tauri/src/app/setup.rs

@@ -1,6 +1,7 @@
 use crate::{app::window, conf::ChatConfJson, utils};
 use log::info;
 use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager};
+use wry::application::accelerator::Accelerator;
 
 pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
     info!("stepup");
@@ -14,23 +15,31 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
     });
 
     if let Some(v) = chat_conf.global_shortcut {
-        info!("global_shortcut");
-        let handle = app.app_handle();
-        let mut shortcut = app.global_shortcut_manager();
-        shortcut
-            .register(&v, move || {
-                if let Some(w) = handle.get_window("core") {
-                    if w.is_visible().unwrap() {
-                        w.hide().unwrap();
-                    } else {
-                        w.show().unwrap();
-                        w.set_focus().unwrap();
-                    }
-                }
-            })
-            .unwrap_or_else(|err| {
-                info!("global_shortcut_register_error: {}", err);
-            });
+        info!("global_shortcut: `{}`", v);
+        match v.parse::<Accelerator>() {
+            Ok(_) => {
+                info!("global_shortcut_register");
+                let handle = app.app_handle();
+                let mut shortcut = app.global_shortcut_manager();
+                shortcut
+                    .register(&v, move || {
+                        if let Some(w) = handle.get_window("core") {
+                            if w.is_visible().unwrap() {
+                                w.hide().unwrap();
+                            } else {
+                                w.show().unwrap();
+                                w.set_focus().unwrap();
+                            }
+                        }
+                    })
+                    .unwrap_or_else(|err| {
+                        info!("global_shortcut_register_error: {}", err);
+                    });
+            }
+            Err(err) => {
+                info!("global_shortcut_parse_error: {}", err);
+            }
+        }
     } else {
         info!("global_shortcut_unregister");
     };

src-tauri/src/app/window.rs

@@ -30,7 +30,7 @@ pub fn control_window(handle: &tauri::AppHandle) {
     let app = handle.clone();
     tokio::spawn(async move {
         WindowBuilder::new(&app, "main", WindowUrl::App("index.html".into()))
-            .title("ChatGPT")
+            .title("Control Center")
             .resizable(true)
             .fullscreen(false)
             .inner_size(800.0, 600.0)