准备发布 0.7.2 版本

fix: 修复预览时程序崩溃报错
GuoJikun · Dec 30, 2024 · e9e13d0 · e9e13d0
2 parents f74fe19 + cfc6fe2
commit e9e13d0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quicklook",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Windows 平台的文件预览工具",
   "private": true,
   "type": "module",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.7.1"
+version = "0.7.2"
 description = "Windows 平台的文件预览工具"
 authors = ["GuoJikun <[email protected]>"]
 license = ""

diff --git a/src-tauri/src/preview.rs b/src-tauri/src/preview.rs
@@ -255,16 +255,16 @@ impl WebRoute {
     }
     pub fn get_route(type_str: &str, file_info: &UFile) -> WebRoute {
         match type_str {
-            "Markdown" => WebRoute::new("/#/preview/md".to_string(), file_info.clone()),
-            "Text" => WebRoute::new("/#/preview/text".to_string(), file_info.clone()),
-            "Image" => WebRoute::new("/#/preview/image".to_string(), file_info.clone()),
-            "Video" => WebRoute::new("/#/preview/video".to_string(), file_info.clone()),
-            "Font" => WebRoute::new("/#/preview/font".to_string(), file_info.clone()),
-            "Code" => WebRoute::new("/#/preview/code".to_string(), file_info.clone()),
-            "Book" => WebRoute::new("/#/preview/book".to_string(), file_info.clone()),
-            "Archive" => WebRoute::new("/#/preview/archive".to_string(), file_info.clone()),
-            "Doc" => WebRoute::new("/#/preview/document".to_string(), file_info.clone()),
-            _ => WebRoute::new("/#/preview/not-support".to_string(), file_info.clone()),
+            "Markdown" => WebRoute::new("/preview/md".to_string(), file_info.clone()),
+            "Text" => WebRoute::new("/preview/text".to_string(), file_info.clone()),
+            "Image" => WebRoute::new("/preview/image".to_string(), file_info.clone()),
+            "Video" => WebRoute::new("/preview/video".to_string(), file_info.clone()),
+            "Font" => WebRoute::new("/preview/font".to_string(), file_info.clone()),
+            "Code" => WebRoute::new("/preview/code".to_string(), file_info.clone()),
+            "Book" => WebRoute::new("/preview/book".to_string(), file_info.clone()),
+            "Archive" => WebRoute::new("/preview/archive".to_string(), file_info.clone()),
+            "Doc" => WebRoute::new("/preview/document".to_string(), file_info.clone()),
+            _ => WebRoute::new("/preview/not-support".to_string(), file_info.clone()),
         }
     }
 }
@@ -314,20 +314,18 @@ impl PreviewFile {
         let next_hook_result = unsafe { WindowsAndMessaging::CallNextHookEx(None, ncode, wparam, lparam) };
         #[cfg(debug_assertions)]
         log::info!("Hook called - next_hook_result: {:?}", next_hook_result);
-
-        tauri::async_runtime::block_on(async {
-            if ncode >= 0 && (wparam.0 == WindowsAndMessaging::WM_KEYDOWN as usize || wparam.0 == WindowsAndMessaging::WM_SYSKEYDOWN as usize) {
-                let kb_struct = unsafe { *(lparam.0 as *const WindowsAndMessaging::KBDLLHOOKSTRUCT) };
-                let vk_code = kb_struct.vkCode;
-
-                if vk_code == KeyboardAndMouse::VK_SPACE.0 as u32 {
-                    // 获取 PreviewFile 实例并处理按键事件
-                    if let Some(app) = unsafe { APP_INSTANCE.as_ref() } {
-                        app.handle_key_down(vk_code);
-                    }
-                } 
-            }
-        });   
+
+        if ncode >= 0 && (wparam.0 == WindowsAndMessaging::WM_KEYDOWN as usize || wparam.0 == WindowsAndMessaging::WM_SYSKEYDOWN as usize) {
+            let kb_struct = unsafe { *(lparam.0 as *const WindowsAndMessaging::KBDLLHOOKSTRUCT) };
+            let vk_code = kb_struct.vkCode;
+
+            if vk_code == KeyboardAndMouse::VK_SPACE.0 as u32 {
+                // 获取 PreviewFile 实例并处理按键事件
+                if let Some(app) = unsafe { APP_INSTANCE.as_ref() } {
+                    app.handle_key_down(vk_code);
+                }
+            } 
+        }
 
         next_hook_result
     }
@@ -385,7 +383,6 @@ impl PreviewFile {
                     .min_inner_size(300.0, 300.0)
                     .on_page_load(move |window, payload| {
                         let cur_path = payload.url().path();
-
                         if cur_path == "/preview" {
                             match payload.event() {
                                 PageLoadEvent::Finished => {

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "quicklook",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "identifier": "dev.jikun.quicklook",
   "build": {
     "frontendDist": "../dist",

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,9 +1,9 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
 import HomeView from '../views/home/index.vue'
 import previewView from '../views/preview/index.vue'
 
 const router = createRouter({
-    history: createWebHashHistory(import.meta.env.BASE_URL),
+    history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
         {
             path: '/',