markpdfdown 0.1.7-beta.5 → 0.1.7-beta.7

package/dist/main/index.js

@@ -1,4 +1,4 @@
-import { app, ipcMain, dialog, protocol, BrowserWindow, shell } from "electron";
+import { app, ipcMain, dialog, protocol, nativeImage, BrowserWindow, shell } from "electron";
 import path from "path";
 import fs, { promises } from "fs";
 import isDev from "electron-is-dev";
@@ -3407,7 +3407,13 @@ if (!app.isPackaged) {
   }
 }
 function getIconPath() {
-  const iconName = process.platform === "darwin" ? "icons/mac/icon.icns" : process.platform === "win32" ? "icons/win/icon.ico" : "icons/png/512x512.png";
+  const useNativeFormat = app.isPackaged;
+  let iconName;
+  if (useNativeFormat) {
+    iconName = process.platform === "darwin" ? "icons/mac/icon.icns" : process.platform === "win32" ? "icons/win/icon.ico" : "icons/png/512x512.png";
+  } else {
+    iconName = "icons/png/512x512.png";
+  }
   if (process.env.ELECTRON_RENDERER_URL) {
     return path.join(process.cwd(), "public", iconName);
   }
@@ -3483,6 +3489,19 @@ async function stopTask() {
 function createWindow() {
   const iconPath = getIconPath();
   const iconExists = fs.existsSync(iconPath);
+  let appIcon;
+  if (iconExists) {
+    try {
+      appIcon = nativeImage.createFromPath(iconPath);
+      if (appIcon.isEmpty()) {
+        console.warn("[Main] Icon loaded but is empty:", iconPath);
+        appIcon = void 0;
+      }
+    } catch (err) {
+      console.warn("[Main] Failed to load icon:", iconPath, err);
+      appIcon = void 0;
+    }
+  }
   mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
@@ -3494,11 +3513,15 @@ function createWindow() {
       contextIsolation: true,
       preload: path.join(__dirname, "../preload/index.js")
     },
-    // 仅在图标文件存在时设置，避免 Electron 抛出错误
-    ...iconExists ? { icon: iconPath } : {}
+    // 仅在图标成功加载时设置
+    ...appIcon ? { icon: appIcon } : {}
   });
-  if (process.platform === "darwin" && app.dock && iconExists) {
-    app.dock.setIcon(iconPath);
+  if (process.platform === "darwin" && app.dock && appIcon) {
+    try {
+      app.dock.setIcon(appIcon);
+    } catch (err) {
+      console.warn("[Main] Failed to set dock icon:", err);
+    }
   }
   windowManager.setMainWindow(mainWindow);
   if (process.env.ELECTRON_RENDERER_URL) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markpdfdown",
-  "version": "0.1.7-beta.5",
+  "version": "0.1.7-beta.7",
   "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.",
   "author": "MarkPDFdown",
   "main": "dist/main/index.js",