koishi-plugin-best-cave 2.7.8 → 2.7.9

package/lib/index.js

@@ -722,42 +722,29 @@ var HashManager = class {
       if (requireAdmin(session, this.config)) return requireAdmin(session, this.config);
       try {
         const allCaves = await this.ctx.database.get("cave", { status: "active" });
-        if (allCaves.length === 0) return "无需补全回声洞哈希";
-        await session.send(`开始补全 ${allCaves.length} 个回声洞的哈希...`);
-        const existingHashes = await this.ctx.database.get("cave_hash", {});
-        const existingHashSet = new Set(existingHashes.map((h4) => `${h4.cave}-${h4.hash}-${h4.type}`));
-        let hashesToInsert = [];
+        const existingHashes = await this.ctx.database.get("cave_hash", {}, { fields: ["cave"] });
+        const hashedCaveIds = new Set(existingHashes.map((h4) => h4.cave));
+        const cavesToProcess = allCaves.filter((cave2) => !hashedCaveIds.has(cave2.id));
+        if (cavesToProcess.length === 0) return "无需补全回声洞哈希";
+        await session.send(`开始补全 ${cavesToProcess.length} 个回声洞的哈希...`);
+        const hashesToInsert = [];
         let processedCaveCount = 0;
-        let totalHashesGenerated = 0;
         let errorCount = 0;
-        const flushBatch = /* @__PURE__ */ __name(async () => {
-          if (hashesToInsert.length === 0) return;
-          await this.ctx.database.upsert("cave_hash", hashesToInsert);
-          totalHashesGenerated += hashesToInsert.length;
-          this.logger.info(`[${processedCaveCount}/${allCaves.length}] 正在导入 ${hashesToInsert.length} 条回声洞哈希...`);
-          hashesToInsert = [];
-        }, "flushBatch");
-        for (const cave2 of allCaves) {
+        for (const cave2 of cavesToProcess) {
           processedCaveCount++;
           try {
             const newHashesForCave = await this.generateAllHashesForCave(cave2);
-            for (const hashObj of newHashesForCave) {
-              const uniqueKey = `${hashObj.cave}-${hashObj.hash}-${hashObj.type}`;
-              if (!existingHashSet.has(uniqueKey)) {
-                hashesToInsert.push(hashObj);
-                existingHashSet.add(uniqueKey);
-              }
-            }
-            if (hashesToInsert.length >= 100) await flushBatch();
+            if (newHashesForCave.length > 0) hashesToInsert.push(...newHashesForCave);
           } catch (error) {
             errorCount++;
             this.logger.warn(`补全回声洞（${cave2.id}）哈希时出错: ${error.message}`);
           }
         }
-        await flushBatch();
-        return `已补全 ${allCaves.length} 个回声洞的 ${totalHashesGenerated} 条哈希（失败 ${errorCount} 条）`;
+        if (hashesToInsert.length > 0) await this.ctx.database.upsert("cave_hash", hashesToInsert);
+        const successCount = processedCaveCount - errorCount;
+        return `已补全 ${successCount} 个回声洞的 ${hashesToInsert.length} 条哈希（失败 ${errorCount} 条）`;
       } catch (error) {
-        this.logger.error("生成哈希失败:", error);
+        this.logger.error("补全哈希失败:", error);
         return `操作失败: ${error.message}`;
       }
     });
@@ -821,13 +808,13 @@ var HashManager = class {
       if (requireAdmin(session, this.config)) return requireAdmin(session, this.config);
       let cavesToProcess;
       try {
+        await session.send("正在修复，请稍候...");
         if (ids.length === 0) {
-          await session.send("正在修复，请稍候...");
           cavesToProcess = await this.ctx.database.get("cave", { status: "active" });
         } else {
           cavesToProcess = await this.ctx.database.get("cave", { id: { $in: ids }, status: "active" });
         }
-        if (!cavesToProcess.length) return "无可修复回声洞";
+        if (!cavesToProcess.length) return "无可修复的回声洞";
         let fixedFiles = 0;
         let errorCount = 0;
         const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞。支持丰富的媒体类型、内容查重、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.7.8",
+  "version": "2.7.9",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],