pake-cli 0.1.0 → 0.1.1

package/dist/cli.js

@@ -1619,7 +1619,8 @@ function mergeTauriConfig(url, options, tauriConf) {
         tauriConf.tauri.bundle.identifier = identifier;
         tauriConf.tauri.bundle.icon = [options.icon];
         if (process.platform === "win32") {
-            const ico_path = path.join(npmDirectory, 'src-tauri/png/weread_32.ico');
+            const ico_path = path.join(npmDirectory, `src-tauri/png/${name.toLowerCase()}_32.ico`);
+            tauriConf.tauri.bundle.resources = [`png/${name.toLowerCase()}_32.ico`];
             yield fs.copyFile(options.icon, ico_path);
         }
         if (process.platform === "linux") {
@@ -2144,7 +2145,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "1.0.0-beta.1";
+var version = "0.1.1";
 var description = "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.";
 var bin = {
 	pake: "./cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.",
   "bin": {
     "pake": "./cli.js"

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)
@@ -184,12 +197,23 @@ fn main() -> wry::Result<()> {
         .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));
@@ -236,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")]