pake-cli 0.0.6 → 0.1.1

package/src-tauri/Cargo.toml

@@ -17,11 +17,11 @@ tauri-build = { version = "1.2.1", features = [] }
 [dependencies]
 serde_json = "1.0.88"
 serde = { version = "1.0.147", features = ["derive"] }
-tauri = { version = "1.2.1", features = ["api-all"] }
+tauri = { version = "1.2.1", features = [] }
 image = "0.24.5"
 tauri-utils = "1.2.1"
 webbrowser = "0.8.2"
-wry = "0.22.5"
+wry = "0.21.1"
 
 [features]
 # by default Tauri runs in production mode

package/src-tauri/src/main.rs

@@ -79,6 +79,12 @@ fn main() -> wry::Result<()> {
 
     #[cfg(target_os = "macos")]
     menu_bar_menu.add_submenu("App", true, first_menu);
+    #[cfg(target_os = "linux")]
+    let (package_name, windows_config) = get_windows_config();
+
+    #[cfg(target_os = "linux")]
+    let package_name = package_name.expect("can't get package name in config file");
+
     #[cfg(target_os = "linux")]
     let WindowConfig {
         url,
@@ -87,7 +93,9 @@ fn main() -> wry::Result<()> {
         resizable,
         fullscreen,
         ..
-    } = get_windows_config().unwrap_or_default();
+    } = windows_config.unwrap_or_default();
+    #[cfg(target_os = "windows")]
+    let (package_name, windows_config) = get_windows_config();
     #[cfg(target_os = "windows")]
     let WindowConfig {
         url,
@@ -96,7 +104,7 @@ fn main() -> wry::Result<()> {
         resizable,
         fullscreen,
         ..
-    } = get_windows_config().unwrap_or_default();
+    } = windows_config.unwrap_or_default();
     #[cfg(target_os = "macos")]
     let WindowConfig {
         url,
@@ -106,7 +114,7 @@ fn main() -> wry::Result<()> {
         transparent,
         fullscreen,
         ..
-    } = get_windows_config().unwrap_or_default();
+    } = get_windows_config().1.unwrap_or_default();
     let event_loop = EventLoop::new();
 
     let common_window = WindowBuilder::new()
@@ -119,8 +127,13 @@ fn main() -> wry::Result<()> {
         })
         .with_inner_size(wry::application::dpi::LogicalSize::new(width, height));
     #[cfg(target_os = "windows")]
-    let icon = load_icon(std::path::Path::new("png/weread_32.ico"));
-
+    let package_name = package_name
+        .expect("can't get package name in config file")
+        .to_lowercase();
+    #[cfg(target_os = "windows")]
+    let icon_path = format!("png/{}_32.ico", package_name);
+    #[cfg(target_os = "windows")]
+    let icon = load_icon(std::path::Path::new(&icon_path));
     #[cfg(target_os = "windows")]
     let window = common_window
         .with_decorations(true)
@@ -157,50 +170,63 @@ fn main() -> wry::Result<()> {
     };
 
     // 用于欺骗部分页面对于浏览器的强检测
-    let user_agent_string = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15";
+
+    // #[cfg(target_os = "macos")]
+    // let user_agent_string = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15";
 
     #[cfg(target_os = "macos")]
     let webview = WebViewBuilder::new(window)?
-        .with_user_agent(user_agent_string)
-        .with_accept_first_mouse(true)
+        // .with_user_agent(user_agent_string)
+        // .with_accept_first_mouse(true)
         .with_url(&url.to_string())?
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
-        .with_back_forward_navigation_gestures(true)
+        // .with_back_forward_navigation_gestures(true)
         .build()?;
 
     #[cfg(target_os = "windows")]
     let webview = WebViewBuilder::new(window)?
-        .with_user_agent(user_agent_string)
-        .with_accept_first_mouse(true)
+        // .with_user_agent(user_agent_string)
+        // .with_accept_first_mouse(true)
         .with_url(&url.to_string())?
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
-        .with_back_forward_navigation_gestures(true)
+        // .with_back_forward_navigation_gestures(true)
         .build()?;
     // 自定义cookie文件夹，仅用于Linux
     // Custom Cookie folder, only for Linux
+    // #[cfg(target_os = "linux")]
+    // let config_path = format!("/home/{}/.config/{}", env!("USER"), package_name);
+    #[cfg(target_os = "linux")]
+    let user = std::env::var_os("USER");
     #[cfg(target_os = "linux")]
-    let data_path =
-        std::path::PathBuf::from(concat!("/home/", env!("USER"), "/.config/com-tw93-weread/"));
+    let config_path = match user {
+        Some(v) => format!(
+            "/home/{}/.config/{}", v.into_string().unwrap(), package_name
+        ),
+        None => panic!("can't found any user")
+    };
+    #[cfg(target_os = "linux")]
+    let data_path = std::path::PathBuf::from(&config_path);
     #[cfg(target_os = "linux")]
     if !std::path::Path::new(&data_path).exists() {
-        std::fs::create_dir(&data_path)?;
+        std::fs::create_dir(&data_path)
+            .unwrap_or_else(|_| panic!("can't create dir {}", &config_path));
     }
     #[cfg(target_os = "linux")]
     let mut web_content = WebContext::new(Some(data_path));
     #[cfg(target_os = "linux")]
     let webview = WebViewBuilder::new(window)?
-        .with_user_agent(user_agent_string)
-        .with_accept_first_mouse(true)
+        // .with_user_agent(user_agent_string)
+        // .with_accept_first_mouse(true)
         .with_url(&url.to_string())?
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
         .with_web_context(&mut web_content)
-        .with_back_forward_navigation_gestures(true)
+        // .with_back_forward_navigation_gestures(true)
         .build()?;
 
     #[cfg(feature = "devtools")]
@@ -234,11 +260,13 @@ fn main() -> wry::Result<()> {
     });
 }
 
-fn get_windows_config() -> Option<WindowConfig> {
+fn get_windows_config() -> (Option<String>, Option<WindowConfig>) {
     let config_file = include_str!("../tauri.conf.json");
     let config: Config = serde_json::from_str(config_file).expect("failed to parse windows config");
-
-    config.tauri.windows.first().cloned()
+    (
+        config.package.product_name.clone(),
+        config.tauri.windows.first().cloned(),
+    )
 }
 
 #[cfg(target_os = "windows")]

package/src-tauri/src/pake.js

@@ -55,6 +55,14 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       padding-top: 20px;
     }
 
+    .lark > .dashboard-sidebar, .lark > .dashboard-sidebar > .sidebar-user-info , .lark > .dashboard-sidebar .index-module_wrapper_F-Wbq{
+      padding-top:15px;
+    }
+
+    .lark > .main-wrapper [data-testid="aside"] {
+      top: 15px;
+    }
+
     .panel.give_me .nav_view {
       top: 154px !important;
     }
@@ -92,23 +100,23 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       margin-top:24px;
     }
 
-    [data-testid="placementTracking"] article,
-    a[href*="quick_promote_web"],
-    [data-testid="AppTabBar_Explore_Link"],
-    a[href*="/lists"][role="link"][aria-label],
-    a[href="/i/bookmarks"] {
+    #react-root [data-testid="placementTracking"] article,
+    #react-root a[href*="quick_promote_web"],
+    #react-root [data-testid="AppTabBar_Explore_Link"],
+    #react-root a[href*="/lists"][role="link"][aria-label],
+    #react-root a[href="/i/bookmarks"] {
       display: none !important;
     }
 
-    [data-testid="DMDrawer"] {
+    #react-root [data-testid="DMDrawer"] {
       visibility: hidden !important;
     }
 
-    [data-testid="primaryColumn"] > div > div {
+    #react-root [data-testid="primaryColumn"] > div > div {
       position: relative !important;
     }
 
-    [data-testid="sidebarColumn"] {
+    #react-root [data-testid="sidebarColumn"] {
       visibility: hidden !important;
       width: 0 !important;
       margin: 0 !important;
@@ -117,69 +125,69 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
 
     @media only screen and (min-width: 1000px) {
-      main[role="main"] {
+      #react-root main[role="main"] {
         align-items: center !important;
         overflow-x: clip !important;
       }
 
-      [data-testid="primaryColumn"] {
+      #react-root [data-testid="primaryColumn"] {
         width: 700px !important;
         max-width: 700px !important;
         margin: 0 auto !important;
       }
-      [data-testid="primaryColumn"] > div > div:last-child,
-      [data-testid="primaryColumn"] > div > div:last-child div {
+      #react-root [data-testid="primaryColumn"] > div > div:last-child,
+      #react-root [data-testid="primaryColumn"] > div > div:last-child div {
         max-width: unset !important;
       }
 
-      div[aria-label][role="group"][id^="id__"] {
+      #react-root div[aria-label][role="group"][id^="id__"] {
         margin-right: 81px !important;
       }
 
-      header[role="banner"] {
+      #react-root header[role="banner"] {
         position: fixed !important;
         left: 0 !important;
       }
 
-      header[role="banner"] > div > div > div {
+      #react-root header[role="banner"] > div > div > div {
         justify-content: center !important;
         padding-top: 0;
       }
 
-      form[role="search"] > div:nth-child(1) > div {
+      #react-root form[role="search"] > div:nth-child(1) > div {
         background-color: transparent !important;
       }
 
-      h1[role="heading"] {
+      #react-root h1[role="heading"] {
         padding-top: 4px !important;
       }
 
-      header[role="banner"]
+      #react-root header[role="banner"]
         nav[role="navigation"]
         *
         div[dir="auto"]:not([aria-label])
         > span,
-      [data-testid="SideNav_AccountSwitcher_Button"] > div:not(:first-child) {
+      #react-root [data-testid="SideNav_AccountSwitcher_Button"] > div:not(:first-child) {
         display: inline-block !important;
         opacity: 0 !important;
         transition: 0.5s cubic-bezier(0.2, 0.8, 0.2, 1);
       }
-      header[role="banner"]
+      #react-root header[role="banner"]
         nav[role="navigation"]:hover
         *
         div[dir="auto"]:not([aria-label])
         > span,
-      [data-testid="SideNav_AccountSwitcher_Button"]:hover > div:not(:first-child) {
+      #react-root [data-testid="SideNav_AccountSwitcher_Button"]:hover > div:not(:first-child) {
         opacity: 1 !important;
       }
-      header[role="banner"] nav[role="navigation"]:hover > * > div {
+      #react-root header[role="banner"] nav[role="navigation"]:hover > * > div {
         backdrop-filter: blur(12px) !important;
       }
-      header[role="banner"] nav[role="navigation"] > a {
+      #react-root header[role="banner"] nav[role="navigation"] > a {
         position: relative;
       }
 
-      header[role="banner"] nav[role="navigation"] > a::before {
+      #react-root header[role="banner"] nav[role="navigation"] > a::before {
         content: "";
         position: absolute;
         top: 0px;
@@ -187,61 +195,56 @@ window.addEventListener("DOMContentLoaded", (_event) => {
         bottom: 0px;
         left: 0px;
       }
-      [data-testid="SideNav_AccountSwitcher_Button"] {
+      #react-root [data-testid="SideNav_AccountSwitcher_Button"] {
         bottom: 18px !important;
         left: 1px !important;
       }
 
-      [data-testid="SideNav_NewTweet_Button"] {
+      #react-root [data-testid="SideNav_NewTweet_Button"] {
         position: fixed !important;
         right: 16px !important;
         bottom: 24px !important;
       }
     }
 
-    @media only screen and (min-width: 1000px) and (max-width: 1265px) {
-      body {
-        padding-left: 88px;
-      }
-    }
-
     @media only screen and (min-width: 1265px) {
-      [data-testid="sidebarColumn"] form[role="search"] {
+      #react-root [data-testid="sidebarColumn"] form[role="search"] {
         visibility: visible !important;
         position: fixed !important;
         top: 12px !important;
         right: 16px !important;
       }
 
-      [data-testid="sidebarColumn"] input[placeholder="Search Twitter"] {
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search Twitter"] {
         width: 150px;
       }
 
-      [data-testid="sidebarColumn"] form[role="search"]:focus-within {
+      #react-root [data-testid="sidebarColumn"] form[role="search"]:focus-within {
         width: 374px !important;
         backdrop-filter: blur(12px) !important;
       }
 
-      [data-testid="sidebarColumn"] input[placeholder="Search Twitter"]:focus {
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search Twitter"]:focus {
         width: 328px !important;
       }
 
-      div[style*="left: -12px"] {
+      #react-root div[style*="left: -12px"] {
         left: unset !important;
       }
-      div[style="left: -8px; width: 306px;"] {
+
+      #react-root div[style="left: -8px; width: 306px;"] {
         left: unset !important;
         width: 374px !important;
       }
 
-      .searchFilters {
+      #react-root .searchFilters {
         visibility: visible !important;
         position: fixed;
         top: 12px;
         right: 16px;
         width: 240px;
       }
-      .searchFilters > div > div:first-child {
+      #react-root .searchFilters > div > div:first-child {
         display: none;
       }
     }
@@ -295,7 +298,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
     if (/macintosh|mac os x/i.test(navigator.userAgent)) {
       if (event.metaKey && event.key in metaKeyShortcuts) {
-        preventDefault(ctrlKeyShortcuts[event.key]);
+        preventDefault(metaKeyShortcuts[event.key]);
       }
     }
   });

package/src-tauri/tauri.conf.json

@@ -14,56 +14,6 @@
         "resizable": true
       }
     ],
-    "allowlist": {
-      "all": true
-    },
-    "bundle": {
-      "icon": [
-        "icons/weread.icns",
-        "png/weread_256.ico",
-        "png/weread_32.ico",
-        "png/weread_512.png"
-      ],
-      "identifier": "com.tw93.weread",
-      "active": true,
-      "category": "DeveloperTool",
-      "copyright": "",
-      "deb": {
-        "depends": [
-          "libwebkit2gtk-4.0-dev",
-          "build-essential",
-          "curl",
-          "wget",
-          "libssl-dev",
-          "libgtk-3-dev",
-          "libayatana-appindicator3-dev",
-          "librsvg2-dev"
-        ],
-        "files": {
-          "/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
-        }
-      },
-      "externalBin": [],
-      "longDescription": "",
-      "macOS": {
-        "entitlements": null,
-        "exceptionDomain": "",
-        "frameworks": [],
-        "providerShortName": null,
-        "signingIdentity": null
-      },
-      "resources": ["png/weread_32.ico"],
-      "shortDescription": "",
-      "targets": ["deb", "msi", "dmg"],
-      "windows": {
-        "certificateThumbprint": null,
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "",
-        "wix": {
-          "language": ["en-US", "zh-CN"]
-        }
-      }
-    },
     "security": {
       "csp": null
     },

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

@@ -0,0 +1,30 @@
+{
+  "package": {
+    "productName": "WeRead",
+    "version": "1.0.0"
+  },
+  "tauri": {
+    "windows": [
+      {
+        "url": "https://weread.qq.com/",
+        "transparent": true,
+        "fullscreen": false,
+        "width": 1200,
+        "height": 728,
+        "resizable": true
+      }
+    ],
+    "security": {
+      "csp": null
+    },
+    "updater": {
+      "active": false
+    }
+  },
+  "build": {
+    "devPath": "../dist",
+    "distDir": "../dist",
+    "beforeBuildCommand": "",
+    "beforeDevCommand": ""
+  }
+}

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

@@ -0,0 +1,34 @@
+{
+  "tauri": {
+    "bundle": {
+      "icon": [
+        "png/weread_256.ico",
+        "png/weread_512.png"
+      ],
+      "identifier": "com.tw93.weread",
+      "active": true,
+      "category": "DeveloperTool",
+      "copyright": "",
+      "deb": {
+        "depends": [
+          "libwebkit2gtk-4.0-dev",
+          "build-essential",
+          "curl",
+          "wget",
+          "libssl-dev",
+          "libgtk-3-dev",
+          "libayatana-appindicator3-dev",
+          "librsvg2-dev"
+        ],
+        "files": {
+          "/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
+        }
+      },
+      "externalBin": [],
+      "longDescription": "",
+      "resources": [],
+      "shortDescription": "",
+      "targets": ["deb"]
+    }
+  }
+}

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

@@ -0,0 +1,25 @@
+{
+  "tauri": {
+    "bundle": {
+      "icon": [
+        "icons/weread.icns"
+      ],
+      "identifier": "com.tw93.weread",
+      "active": true,
+      "category": "DeveloperTool",
+      "copyright": "",
+      "externalBin": [],
+      "longDescription": "",
+      "macOS": {
+        "entitlements": null,
+        "exceptionDomain": "",
+        "frameworks": [],
+        "providerShortName": null,
+        "signingIdentity": null
+      },
+      "resources": [],
+      "shortDescription": "",
+      "targets": ["dmg"]
+    }
+  }
+}

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

@@ -0,0 +1,27 @@
+{
+  "tauri": {
+    "bundle": {
+      "icon": [
+        "png/weread_256.ico",
+        "png/weread_32.ico"
+      ],
+      "identifier": "com.tw93.weread",
+      "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"]
+        }
+      }
+    }
+  }
+}