pake-cli 3.0.0-beta → 3.0.2

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

@@ -26,22 +26,22 @@ pub fn get_window(app: &mut App, config: &PakeConfig, _data_dir: PathBuf) -> Web
 
     let mut window_builder = WebviewWindowBuilder::new(app, "pake", url)
         .title("")
+        .visible(false)
         .user_agent(user_agent)
-        .visible(false) // Prevent initial shaking
         .resizable(window_config.resizable)
         .fullscreen(window_config.fullscreen)
         .inner_size(window_config.width, window_config.height)
         .always_on_top(window_config.always_on_top)
+        .disable_drag_drop_handler()
         .initialization_script(&config_script)
         .initialization_script(include_str!("../inject/component.js"))
         .initialization_script(include_str!("../inject/event.js"))
         .initialization_script(include_str!("../inject/style.js"))
-        //This is necessary to allow for file injection by external developers for customization purposes.
         .initialization_script(include_str!("../inject/custom.js"));
 
-    if config.proxy_url != "" {
+    if !config.proxy_url.is_empty() {
         window_builder =
-            window_builder.proxy_url(Url::from_str(&config.proxy_url.as_str()).unwrap());
+            window_builder.proxy_url(Url::from_str(config.proxy_url.as_str()).unwrap());
     }
 
     #[cfg(target_os = "macos")]

package/src-tauri/src/inject/event.js

@@ -175,19 +175,19 @@ document.addEventListener('DOMContentLoaded', () => {
     };
   }
 
-  const isExternalLink = link => window.location.host !== link.host;
   // process special download protocol['data:','blob:']
   const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol));
 
   const isDownloadRequired = (url, anchorElement, e) => anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
 
-  const handleExternalLink = (url) => {
+  const handleExternalLink = url => {
     invoke('plugin:shell|open', {
       path: url,
     });
   };
 
   const detectAnchorElementClick = e => {
+
     const anchorElement = e.target.closest('a');
 
     if (anchorElement && anchorElement.href) {
@@ -224,7 +224,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
-  window.open = function(url, name, specs) {
+  window.open = function (url, name, specs) {
     // Apple login and google login
     if (name === 'AppleAuthentication') {
       //do nothing

package/src-tauri/src/lib.rs

@@ -23,7 +23,7 @@ pub fn run_app() {
 
     // Save the value of toggle_app_shortcut before pake_config is moved
     let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
-    let init_fullscreen = pake_config.windows[0].fullscreen.clone();
+    let init_fullscreen = pake_config.windows[0].fullscreen;
 
     let window_state_plugin = if init_fullscreen {
         windowStatePlugin::default()
@@ -38,12 +38,13 @@ pub fn run_app() {
         .plugin(tauri_plugin_oauth::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_single_instance::init(|_, _, _| ()))
         .invoke_handler(tauri::generate_handler![
             download_file,
             download_file_by_binary
         ])
         .setup(move |app| {
-            let data_dir = get_data_dir(&app.app_handle(), tauri_config.clone());
+            let data_dir = get_data_dir(app.app_handle(), tauri_config.clone());
 
             let _window = get_window(app, &pake_config, data_dir);
 
@@ -51,14 +52,14 @@ pub fn run_app() {
             _window.show().unwrap();
 
             if show_system_tray {
-                let _ = set_system_tray(&app.app_handle());
+                let _ = set_system_tray(app.app_handle());
             } else {
                 app.app_handle().remove_tray_by_id("pake-tray");
             }
 
             if !activation_shortcut.is_empty() {
                 let app_handle = app.app_handle().clone();
-                let shortcut_hotkey = Shortcut::from_str(&activation_shortcut.as_str()).unwrap();
+                let shortcut_hotkey = Shortcut::from_str(activation_shortcut.as_str()).unwrap();
                 let last_triggered = Arc::new(Mutex::new(Instant::now()));
 
                 app_handle
@@ -101,26 +102,20 @@ pub fn run_app() {
             Ok(())
         })
         .on_window_event(|window, event| {
+            #[cfg(target_os = "macos")]
             if let tauri::WindowEvent::CloseRequested { api, .. } = event {
                 let window = window.clone();
-
-                #[cfg(target_os = "macos")]
                 {
-                    let window_handle = window.clone();
                     tauri::async_runtime::spawn(async move {
-                        if window_handle.is_fullscreen().unwrap_or(false) {
-                            window_handle.set_fullscreen(false).unwrap();
+                        if window.is_fullscreen().unwrap_or(false) {
+                            window.set_fullscreen(false).unwrap();
                             // Give a small delay to ensure the full-screen exit operation is completed.
                             tokio::time::sleep(Duration::from_millis(900)).await;
                         }
-                        window_handle.minimize().unwrap();
-                        window_handle.hide().unwrap();
+                        window.minimize().unwrap();
+                        window.hide().unwrap();
                     });
                 }
-
-                #[cfg(not(target_os = "macos"))]
-                window.close().unwrap();
-
                 api.prevent_close();
             }
         })

package/src-tauri/tauri.conf.json

@@ -1,22 +1,16 @@
 {
   "productName": "WeRead",
   "identifier": "com.pake.weread",
-  "version": "2.0.0",
-  "plugins": {},
+  "version": "1.0.0",
   "app": {
-    "security": {
-      "csp": null
-    },
+    "withGlobalTauri": true,
     "trayIcon": {
       "iconPath": "png/weread_512.png",
       "iconAsTemplate": false,
       "id": "pake-tray"
-    },
-    "withGlobalTauri": true
+    }
   },
   "build": {
-    "beforeBuildCommand": "",
-    "frontendDist": "../dist",
-    "beforeDevCommand": ""
+    "frontendDist": "../dist"
   }
 }

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

@@ -1,20 +1,14 @@
 {
-  "productName": "weread",
+  "productName": "we-read",
   "bundle": {
     "icon": ["png/weread_512.png"],
     "active": true,
-    "category": "DeveloperTool",
-    "copyright": "",
     "linux": {
       "deb": {
         "depends": ["curl", "wget"],
         "files": { "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop" }
       }
     },
-    "externalBin": [],
-    "longDescription": "",
-    "resources": [],
-    "shortDescription": "",
     "targets": ["deb", "appimage"]
   }
 }

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

@@ -2,19 +2,7 @@
   "bundle": {
     "icon": ["icons/weread.icns"],
     "active": true,
-    "category": "DeveloperTool",
-    "copyright": "",
-    "externalBin": [],
-    "longDescription": "",
-    "macOS": {
-      "entitlements": null,
-      "exceptionDomain": null,
-      "frameworks": [],
-      "providerShortName": null,
-      "signingIdentity": null
-    },
-    "resources": [],
-    "shortDescription": "",
+    "macOS": {},
     "targets": ["dmg"]
   }
 }

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

@@ -2,17 +2,10 @@
   "bundle": {
     "icon": ["png/weread_256.ico", "png/weread_32.ico"],
     "active": true,
-    "category": "DeveloperTool",
-    "copyright": "",
-    "externalBin": [],
-    "longDescription": "",
     "resources": ["png/weread_32.ico"],
-    "shortDescription": "",
     "targets": ["msi"],
     "windows": {
-      "certificateThumbprint": null,
       "digestAlgorithm": "sha256",
-      "timestampUrl": "",
       "wix": {
         "language": ["en-US"],
         "template": "assets/main.wxs"