pake-cli 3.6.1 → 3.6.2

package/src-tauri/.pake/pake.json

@@ -0,0 +1,43 @@
+{
+    "windows": [
+        {
+            "url": "https://github.com",
+            "url_type": "web",
+            "hide_title_bar": true,
+            "fullscreen": false,
+            "width": 1200,
+            "height": 800,
+            "resizable": true,
+            "always_on_top": false,
+            "dark_mode": false,
+            "activation_shortcut": "",
+            "disabled_web_shortcuts": false,
+            "hide_on_close": true,
+            "incognito": false,
+            "enable_wasm": false,
+            "enable_drag_drop": false,
+            "maximize": false,
+            "start_to_tray": false,
+            "force_internal_navigation": false,
+            "title": null,
+            "zoom": 100,
+            "min_width": 0,
+            "min_height": 0,
+            "ignore_certificate_errors": false
+        }
+    ],
+    "user_agent": {
+        "macos": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15",
+        "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36",
+        "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36"
+    },
+    "system_tray": {
+        "macos": false,
+        "linux": true,
+        "windows": true
+    },
+    "system_tray_path": "png/icon_512.png",
+    "inject": [],
+    "proxy_url": "",
+    "multi_instance": false
+}

package/src-tauri/.pake/tauri.conf.json

@@ -0,0 +1,27 @@
+{
+    "productName": "GitHubMultiArch",
+    "identifier": "com.pake.3097fc",
+    "version": "1.0.0",
+    "app": {
+        "withGlobalTauri": true,
+        "security": {
+            "headers": {},
+            "csp": null
+        }
+    },
+    "build": {
+        "frontendDist": "../dist"
+    },
+    "bundle": {
+        "icon": [
+            "icons/githubmultiarch.icns"
+        ],
+        "active": true,
+        "targets": [
+            "app"
+        ],
+        "resources": [
+            "icons/githubmultiarch.icns"
+        ]
+    }
+}

package/src-tauri/.pake/tauri.linux.conf.json

@@ -0,0 +1,13 @@
+{
+  "productName": "weekly",
+  "bundle": {
+    "icon": ["png/weekly_512.png"],
+    "active": true,
+    "linux": {
+      "deb": {
+        "depends": ["curl", "wget"]
+      }
+    },
+    "targets": ["deb", "appimage"]
+  }
+}

package/src-tauri/.pake/tauri.macos.conf.json

@@ -0,0 +1,14 @@
+{
+    "bundle": {
+        "icon": [
+            "icons/githubmultiarch.icns"
+        ],
+        "active": true,
+        "targets": [
+            "app"
+        ],
+        "resources": [
+            "icons/githubmultiarch.icns"
+        ]
+    }
+}

package/src-tauri/.pake/tauri.windows.conf.json

@@ -0,0 +1,15 @@
+{
+  "bundle": {
+    "icon": ["png/weekly_256.ico", "png/weekly_32.ico"],
+    "active": true,
+    "resources": ["png/weekly_32.ico"],
+    "targets": ["msi"],
+    "windows": {
+      "digestAlgorithm": "sha256",
+      "wix": {
+        "language": ["en-US"],
+        "template": "assets/main.wxs"
+      }
+    }
+  }
+}

package/src-tauri/src/app/invoke.rs

@@ -50,11 +50,11 @@ pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result
         .await;
 
     match response {
-        Ok(res) => {
-            let bytes = res.bytes().await.unwrap();
-
+        Ok(mut res) => {
             let mut file = File::create(file_path).unwrap();
-            file.write_all(&bytes).unwrap();
+            while let Some(chunk) = res.chunk().await.unwrap() {
+                file.write_all(&chunk).unwrap();
+            }
             show_toast(
                 &window,
                 &get_download_message_with_lang(MessageType::Success, params.language.clone()),

package/src-tauri/src/app/menu.rs

@@ -0,0 +1,281 @@
+use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
+use tauri::{AppHandle, Manager, Wry};
+use tauri_plugin_opener::OpenerExt;
+
+pub fn get_menu(app: &AppHandle<Wry>) -> Menu<Wry> {
+    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).unwrap();
+    let about_metadata = AboutMetadata::default();
+    app_menu
+        .append(&PredefinedMenuItem::about(app, Some("Pake"), Some(about_metadata)).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::services(app, None).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::hide(app, None).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::hide_others(app, None).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::show_all(app, None).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    app_menu
+        .append(&PredefinedMenuItem::quit(app, None).unwrap())
+        .unwrap();
+
+    // File Menu
+    let file_menu = Submenu::new(app, "File", true).unwrap();
+    file_menu
+        .append(&PredefinedMenuItem::close_window(app, None).unwrap())
+        .unwrap();
+    file_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    file_menu
+        .append(
+            &MenuItem::with_id(
+                app,
+                "clear_cache_restart",
+                "Clear Cache & Restart",
+                true,
+                Some("CmdOrCtrl+Shift+Backspace"),
+            )
+            .unwrap(),
+        )
+        .unwrap();
+
+    // Edit Menu
+    let edit_menu = Submenu::new(app, "Edit", true).unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::undo(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::redo(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::cut(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::copy(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::paste(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::select_all(app, None).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    edit_menu
+        .append(&MenuItem::with_id(app, "copy_url", "Copy URL", true, Some("CmdOrCtrl+L")).unwrap())
+        .unwrap();
+
+    // View Menu
+    let view_menu = Submenu::new(app, "View", true).unwrap();
+    view_menu
+        .append(&MenuItem::with_id(app, "reload", "Reload", true, Some("CmdOrCtrl+R")).unwrap())
+        .unwrap();
+    view_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    view_menu
+        .append(&MenuItem::with_id(app, "zoom_in", "Zoom In", true, Some("CmdOrCtrl+=")).unwrap())
+        .unwrap();
+    view_menu
+        .append(&MenuItem::with_id(app, "zoom_out", "Zoom Out", true, Some("CmdOrCtrl+-")).unwrap())
+        .unwrap();
+    view_menu
+        .append(
+            &MenuItem::with_id(app, "zoom_reset", "Actual Size", true, Some("CmdOrCtrl+0"))
+                .unwrap(),
+        )
+        .unwrap();
+    view_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    view_menu
+        .append(&PredefinedMenuItem::fullscreen(app, None).unwrap())
+        .unwrap();
+    view_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    view_menu
+        .append(
+            &MenuItem::with_id(
+                app,
+                "toggle_devtools",
+                "Toggle Developer Tools",
+                cfg!(debug_assertions),
+                Some("CmdOrCtrl+Option+I"),
+            )
+            .unwrap(),
+        )
+        .unwrap();
+
+    // Navigation Menu
+    let navigation_menu = Submenu::new(app, "Navigation", true).unwrap();
+    navigation_menu
+        .append(&MenuItem::with_id(app, "go_back", "Back", true, Some("CmdOrCtrl+[")).unwrap())
+        .unwrap();
+    navigation_menu
+        .append(
+            &MenuItem::with_id(app, "go_forward", "Forward", true, Some("CmdOrCtrl+]")).unwrap(),
+        )
+        .unwrap();
+    navigation_menu
+        .append(
+            &MenuItem::with_id(app, "go_home", "Go Home", true, Some("CmdOrCtrl+Shift+H")).unwrap(),
+        )
+        .unwrap();
+
+    // Window Menu
+    let window_menu = Submenu::new(app, "Window", true).unwrap();
+    window_menu
+        .append(&PredefinedMenuItem::minimize(app, None).unwrap())
+        .unwrap();
+    window_menu
+        .append(&PredefinedMenuItem::maximize(app, None).unwrap())
+        .unwrap();
+    window_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    window_menu
+        .append(
+            &MenuItem::with_id(
+                app,
+                "always_on_top",
+                "Toggle Always on Top",
+                true,
+                None::<&str>,
+            )
+            .unwrap(),
+        )
+        .unwrap();
+    window_menu
+        .append(&PredefinedMenuItem::separator(app).unwrap())
+        .unwrap();
+    window_menu
+        .append(&PredefinedMenuItem::close_window(app, None).unwrap())
+        .unwrap();
+
+    // Help Menu (Custom)
+    let help_menu = Submenu::new(app, "Help", true).unwrap();
+    let github_item = MenuItem::with_id(
+        app,
+        "pake_github_link",
+        &pake_menu_item_title,
+        true,
+        None::<&str>,
+    )
+    .unwrap();
+    help_menu.append(&github_item).unwrap();
+
+    // Construct the Menu Bar
+    let menu = Menu::with_items(
+        app,
+        &[
+            &app_menu,
+            &file_menu,
+            &edit_menu,
+            &view_menu,
+            &navigation_menu,
+            &window_menu,
+            &help_menu,
+        ],
+    )
+    .unwrap();
+
+    menu
+}
+
+pub fn handle_menu_click(app_handle: &AppHandle, id: &str) {
+    match id {
+        "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);
+            }
+        }
+        _ => {}
+    }
+}

package/src-tauri/src/app/mod.rs

@@ -1,4 +1,5 @@
 pub mod config;
 pub mod invoke;
+pub mod menu;
 pub mod setup;
 pub mod window;

package/src-tauri/src/lib.rs

@@ -9,9 +9,6 @@ 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
-
 use app::{
     invoke::{
         clear_cache_and_restart, download_file, download_file_by_binary, send_notification,
@@ -72,238 +69,12 @@ 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,
-                ],
-            )?;
-
+            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| {
-                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);
-                        }
-                    }
-                    _ => {}
-                }
+                app::menu::handle_menu_click(app_handle, event.id().as_ref());
             });
             // --- Menu Construction End ---
 

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