pake-cli 3.6.1 → 3.6.3

package/src-tauri/src/lib.rs

@@ -9,8 +9,7 @@ use tauri_plugin_window_state::StateFlags;
 #[cfg(target_os = "macos")]
 use std::time::Duration;
 
-use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
-use tauri_plugin_opener::OpenerExt; // Add this
+const WINDOW_SHOW_DELAY: u64 = 50;
 
 use app::{
     invoke::{
@@ -72,239 +71,16 @@ pub fn run_app() {
         ])
         .setup(move |app| {
             // --- Menu Construction Start ---
-            let pake_version = env!("CARGO_PKG_VERSION");
-            let pake_menu_item_title = format!("Built with Pake V{}", pake_version);
-
-            // App Menu (macOS specific, e.g., "Pake")
-            let app_menu = Submenu::new(app, "Pake", true)?;
-            let about_metadata = AboutMetadata::default();
-            app_menu.append(&PredefinedMenuItem::about(
-                app,
-                Some("Pake"),
-                Some(about_metadata),
-            )?)?;
-            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            app_menu.append(&PredefinedMenuItem::services(app, None)?)?;
-            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            app_menu.append(&PredefinedMenuItem::hide(app, None)?)?;
-            app_menu.append(&PredefinedMenuItem::hide_others(app, None)?)?;
-            app_menu.append(&PredefinedMenuItem::show_all(app, None)?)?;
-            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            app_menu.append(&PredefinedMenuItem::quit(app, None)?)?;
-
-            // File Menu
-            let file_menu = Submenu::new(app, "File", true)?;
-            file_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
-            file_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            file_menu.append(&MenuItem::with_id(
-                app,
-                "clear_cache_restart",
-                "Clear Cache & Restart",
-                true,
-                Some("CmdOrCtrl+Shift+Backspace"),
-            )?)?;
-
-            // Edit Menu
-            let edit_menu = Submenu::new(app, "Edit", true)?;
-            edit_menu.append(&PredefinedMenuItem::undo(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::redo(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            edit_menu.append(&PredefinedMenuItem::cut(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::copy(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::paste(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
-            edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            edit_menu.append(&MenuItem::with_id(
-                app,
-                "copy_url",
-                "Copy URL",
-                true,
-                Some("CmdOrCtrl+L"),
-            )?)?;
-
-            // View Menu
-            let view_menu = Submenu::new(app, "View", true)?;
-            view_menu.append(&MenuItem::with_id(
-                app,
-                "reload",
-                "Reload",
-                true,
-                Some("CmdOrCtrl+R"),
-            )?)?;
-            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            view_menu.append(&MenuItem::with_id(
-                app,
-                "zoom_in",
-                "Zoom In",
-                true,
-                Some("CmdOrCtrl+="),
-            )?)?;
-            view_menu.append(&MenuItem::with_id(
-                app,
-                "zoom_out",
-                "Zoom Out",
-                true,
-                Some("CmdOrCtrl+-"),
-            )?)?;
-            view_menu.append(&MenuItem::with_id(
-                app,
-                "zoom_reset",
-                "Actual Size",
-                true,
-                Some("CmdOrCtrl+0"),
-            )?)?;
-            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            view_menu.append(&PredefinedMenuItem::fullscreen(app, None)?)?;
-            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            view_menu.append(&MenuItem::with_id(
-                app,
-                "toggle_devtools",
-                "Toggle Developer Tools",
-                cfg!(debug_assertions),
-                Some("CmdOrCtrl+Option+I"),
-            )?)?;
-
-            // Navigation Menu
-            let navigation_menu = Submenu::new(app, "Navigation", true)?;
-            navigation_menu.append(&MenuItem::with_id(
-                app,
-                "go_back",
-                "Back",
-                true,
-                Some("CmdOrCtrl+["),
-            )?)?;
-            navigation_menu.append(&MenuItem::with_id(
-                app,
-                "go_forward",
-                "Forward",
-                true,
-                Some("CmdOrCtrl+]"),
-            )?)?;
-            navigation_menu.append(&MenuItem::with_id(
-                app,
-                "go_home",
-                "Go Home",
-                true,
-                Some("CmdOrCtrl+Shift+H"),
-            )?)?;
-
-            // Window Menu
-            let window_menu = Submenu::new(app, "Window", true)?;
-            window_menu.append(&PredefinedMenuItem::minimize(app, None)?)?;
-            window_menu.append(&PredefinedMenuItem::maximize(app, None)?)?;
-            window_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            window_menu.append(&MenuItem::with_id(
-                app,
-                "always_on_top",
-                "Toggle Always on Top",
-                true,
-                None::<&str>,
-            )?)?;
-            window_menu.append(&PredefinedMenuItem::separator(app)?)?;
-            window_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
-
-            // Help Menu (Custom)
-            let help_menu = Submenu::new(app, "Help", true)?;
-            let github_item = MenuItem::with_id(
-                app,
-                "pake_github_link",
-                &pake_menu_item_title,
-                true,
-                None::<&str>,
-            )?;
-            help_menu.append(&github_item)?;
-
-            // Construct the Menu Bar
-            let menu = Menu::with_items(
-                app,
-                &[
-                    &app_menu,
-                    &file_menu,
-                    &edit_menu,
-                    &view_menu,
-                    &navigation_menu,
-                    &window_menu,
-                    &help_menu,
-                ],
-            )?;
-
-            app.set_menu(menu)?;
-
-            // Event Handling for Custom Menu Item
-            app.on_menu_event(move |app_handle, event| {
-                match event.id().as_ref() {
-                    "pake_github_link" => {
-                        let _ = app_handle
-                            .opener()
-                            .open_url("https://github.com/tw93/Pake", None::<&str>);
-                    }
-                    "reload" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("window.location.reload()");
-                        }
-                    }
-                    "toggle_devtools" => {
-                        #[cfg(debug_assertions)] // Only allow in debug builds
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            if window.is_devtools_open() {
-                                window.close_devtools();
-                            } else {
-                                window.open_devtools();
-                            }
-                        }
-                    }
-                    "zoom_in" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("zoomIn()");
-                        }
-                    }
-                    "zoom_out" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("zoomOut()");
-                        }
-                    }
-                    "zoom_reset" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("setZoom('100%')");
-                        }
-                    }
-                    "go_back" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("window.history.back()");
-                        }
-                    }
-                    "go_forward" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("window.history.forward()");
-                        }
-                    }
-                    "go_home" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ = window.eval("window.location.href = window.pakeConfig.url");
-                        }
-                    }
-                    "copy_url" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let _ =
-                                window.eval("navigator.clipboard.writeText(window.location.href)");
-                        }
-                    }
-                    "clear_cache_restart" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            if let Ok(_) = window.clear_all_browsing_data() {
-                                app_handle.restart();
-                            }
-                        }
-                    }
-                    "always_on_top" => {
-                        if let Some(window) = app_handle.get_webview_window("pake") {
-                            let is_on_top = window.is_always_on_top().unwrap_or(false);
-                            let _ = window.set_always_on_top(!is_on_top);
-                        }
-                    }
-                    _ => {}
-                }
-            });
+            #[cfg(target_os = "macos")]
+            {
+                let menu = app::menu::get_menu(app.app_handle())?;
+                app.set_menu(menu)?;
+
+                // Event Handling for Custom Menu Item
+                app.on_menu_event(move |app_handle, event| {
+                    app::menu::handle_menu_click(app_handle, event.id().as_ref());
+                });
+            }
             // --- Menu Construction End ---
 
             let window = set_window(app, &pake_config, &tauri_config);
@@ -321,7 +97,7 @@ pub fn run_app() {
             if !start_to_tray {
                 let window_clone = window.clone();
                 tauri::async_runtime::spawn(async move {
-                    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+                    tokio::time::sleep(tokio::time::Duration::from_millis(WINDOW_SHOW_DELAY)).await;
                     window_clone.show().unwrap();
                 });
             }

package/src-tauri/assets/com-tw93-weekly.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Office
-Exec=com-pake-weekly
-Icon=com-pake-weekly
-Name=com-pake-weekly
-Name[zh_CN]=潮流周刊
-StartupNotify=true
-Terminal=false
-Type=Application