picgo-plugin-gitee 2.1.2 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo-plugin-gitee",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "picgo uploader for gitee",
   "main": "src/index.js",
   "files": [
@@ -31,7 +31,8 @@
     "release:patch": "npm run bump:patch && npm publish",
     "release:minor": "npm run bump:minor && npm publish",
     "release:major": "npm run bump:major && npm publish",
-    "prepublishOnly": "node --check src/index.js"
+    "prepublishOnly": "node --check src/index.js",
+    "publish": "npm publish"
   },
   "keywords": [
     "picgo",

package/src/index.js

@@ -41,7 +41,18 @@ module.exports = (ctx) => {
             const stack = err && err.stack ? err.stack : "";
             log("error", "[同步]失败：" + msg);
             if (stack) log("error", stack);
-            // 弹窗 + 系统通知，三重保险
+            // 通道 1：ctx.emit('notification') — PicGo 主窗口消息中心（最可靠）
+            try {
+              if (ctx && ctx.emit) {
+                ctx.emit("notification", {
+                  title: "Gitee 同步失败",
+                  body: msg,
+                });
+              }
+            } catch (e) {
+              log("error", "[同步]ctx.emit 失败：" + e.message);
+            }
+            // 通道 2：showMessageBox — 系统弹窗，最醒目
             if (guiApi && guiApi.showMessageBox) {
               try {
                 guiApi.showMessageBox({
@@ -54,6 +65,7 @@ module.exports = (ctx) => {
                 log("error", "[同步]showMessageBox 失败：" + e.message);
               }
             }
+            // 通道 3：showNotification — 系统通知（依赖 OS 权限）
             if (guiApi && guiApi.showNotification) {
               try {
                 guiApi.showNotification({
@@ -171,12 +183,7 @@ module.exports = (ctx) => {
       `[同步]配置 OK: owner=${userConfig.owner} repo=${userConfig.repo} path=${userConfig.path || "(root)"}`
     );
 
-    if (guiApi.showNotification) {
-      guiApi.showNotification({
-        title: "正在同步",
-        body: "正在从 Gitee 拉取远程文件...",
-      });
-    }
+    notify("success", ctx, guiApi, "正在同步", "正在从 Gitee 拉取远程文件...");
 
     log("info", "[同步]开始递归拉取 Gitee 文件列表");
     const remoteFiles = await listAllRemoteFiles(userConfig);
@@ -184,17 +191,25 @@ module.exports = (ctx) => {
 
     if (remoteFiles.length === 0) {
       log("warn", "[同步]仓库里没有任何图片文件");
-      if (guiApi.showNotification) {
-        guiApi.showNotification({
-          title: "Gitee 同步完成",
-          body: "仓库里没有任何图片文件",
-        });
-      }
+      notify(
+        "success",
+        ctx,
+        guiApi,
+        "Gitee 同步完成",
+        "仓库里没有任何图片文件"
+      );
       return;
     }
 
     log("info", "[同步]读取本地相册");
-    const existing = (await guiApi.galleryDB.get()) || [];
+    // galleryDB.get() 返回 { total, data }（picgo/store 格式），
+    // 也可能直接返回数组（早期版本兼容）。两种都处理。
+    const getResult = await guiApi.galleryDB.get();
+    const existing = Array.isArray(getResult)
+      ? getResult
+      : getResult && Array.isArray(getResult.data)
+      ? getResult.data
+      : [];
     log("info", `[同步]本地相册已有 ${existing.length} 条`);
     const existingUrls = new Set(existing.map((x) => x.imgUrl));
     const newItems = remoteFiles
@@ -212,12 +227,13 @@ module.exports = (ctx) => {
     );
 
     if (newItems.length === 0) {
-      if (guiApi.showNotification) {
-        guiApi.showNotification({
-          title: "Gitee 同步完成",
-          body: "没有新增文件，相册已是最新",
-        });
-      }
+      notify(
+        "success",
+        ctx,
+        guiApi,
+        "Gitee 同步完成",
+        "没有新增文件，相册已是最新"
+      );
       return;
     }
 
@@ -227,11 +243,51 @@ module.exports = (ctx) => {
       "success",
       `[同步]完成：共 ${remoteFiles.length} 个，新增 ${newItems.length} 个`
     );
-    if (guiApi.showNotification) {
-      guiApi.showNotification({
-        title: "Gitee 同步完成",
-        body: `新增 ${newItems.length} 个文件到相册（共发现 ${remoteFiles.length} 个）`,
-      });
+    notify(
+      "success",
+      ctx,
+      guiApi,
+      "Gitee 同步完成",
+      `新增 ${newItems.length} 个文件到相册（共发现 ${remoteFiles.length} 个）`
+    );
+  };
+
+  // 多通道通知：根据场景选用合适的通道。
+  // picgo 文档说明：ctx.emit('notification') 是给**失败**提示专用的通道；
+  // 成功时 picgo 主进程已经处理（gui 弹窗/消息中心），插件无需重复 emit。
+  // 所以 notify 函数有 success / fail 两种模式。
+  const notify = function (mode, ctx, guiApi, title, body) {
+    log(mode === "fail" ? "error" : "success", `[notify] ${title}: ${body}`);
+
+    if (mode === "fail") {
+      // 失败：ctx.emit（picgo 主窗口消息中心）+ showMessageBox 弹窗（最醒目）+ showNotification
+      try {
+        if (ctx && ctx.emit) {
+          ctx.emit("notification", { title, body });
+        }
+      } catch (e) {
+        log("error", "[notify] ctx.emit 失败：" + e.message);
+      }
+      try {
+        if (guiApi && guiApi.showMessageBox) {
+          guiApi.showMessageBox({
+            type: "error",
+            title: title,
+            message: body,
+          });
+        }
+      } catch (e) {
+        log("error", "[notify] showMessageBox 失败：" + e.message);
+      }
+    }
+
+    // 成功和失败都触发系统通知（依赖 OS 权限）
+    try {
+      if (guiApi && guiApi.showNotification) {
+        log("11111", guiApi.showNotification({ title, body }));
+      }
+    } catch (e) {
+      log("error", "[notify] showNotification 失败：" + e.message);
     }
   };
 
@@ -317,13 +373,8 @@ module.exports = (ctx) => {
       delete imgList[i].buffer;
     }
 
-    // 上传结束后统一给一条汇总通知，避免每次上传都点弹窗打扰用户。
-    if (successCount > 0) {
-      ctx.emit("notification", {
-        title: "上传完成",
-        body: `成功 ${successCount} 张${failCount > 0 ? `，失败 ${failCount} 张` : ""}`,
-      });
-    }
+    // 上传成功：让 picgo 主进程自己处理（它会弹"上传成功"提示），
+    // 不重复 emit('notification')。这里只写日志 + 显示消息中心（如果失败）。
     if (fails.length > 0) {
       ctx.log.info("[上传操作]失败明细：" + JSON.stringify(fails));
     }
@@ -356,7 +407,9 @@ module.exports = (ctx) => {
   };
 
   // trigger delete file
-  const onRemove = async function (files) {
+  // trigger delete file
+  // 从 PicGo GUI 2.3.0 起，remove 事件的第二个参数是 guiApi（Electron 专属）
+  const onRemove = async function (files, guiApi) {
     const rms = files.filter((each) => each.type === uploadedName);
     if (rms.length === 0) {
       return;
@@ -379,10 +432,13 @@ module.exports = (ctx) => {
           "[删除操作]获取 sha 失败，跳过：" + each.imgUrl + " " + err.message
         );
         fails.push(`${each.fileName || each.imgUrl}: 获取 sha 失败`);
-        ctx.emit("notification", {
-          title: "删除失败",
-          body: `${each.fileName || each.imgUrl} 获取 sha 失败`,
-        });
+        notify(
+          "fail",
+          ctx,
+          guiApi,
+          "删除失败",
+          `${each.fileName || each.imgUrl} 获取 sha 失败`
+        );
         continue;
       }
 
@@ -419,21 +475,28 @@ module.exports = (ctx) => {
             err.message
         );
         fails.push(`${each.fileName || each.imgUrl}: ${err.message}`);
-        ctx.emit("notification", {
-          title: "删除失败",
-          body: `${each.fileName || each.imgUrl} ${err.message}`,
-        });
+        notify(
+          "fail",
+          ctx,
+          guiApi,
+          "删除失败",
+          `${each.fileName || each.imgUrl} ${err.message}`
+        );
       }
     }
 
-    // 汇总通知，避免重复打扰。
+    // 删除成功：用 guiApi.showNotification 通知（picgo 不自动处理此通知）
     if (successNames.length > 0) {
-      ctx.emit("notification", {
-        title: "删除完成",
-        body:
-          `成功同步删除 ${successNames.length} 个` +
-          (fails.length > 0 ? `，失败 ${fails.length} 个` : ""),
-      });
+      try {
+        if (guiApi && guiApi.showNotification) {
+          guiApi.showNotification({
+            title: "删除完成",
+            body: `成功同步删除 ${successNames.length} 个`,
+          });
+        }
+      } catch (e) {
+        log("error", "[删除操作]showNotification 失败：" + e.message);
+      }
     }
     if (fails.length > 0) {
       ctx.log.info("[删除操作]失败明细：" + JSON.stringify(fails));