视频解密优化

electron/services/videoService.ts

@@ -97,7 +97,7 @@ class VideoService {
                             return realMd5
                         }
                     } catch (e) {
-                        // Silently fail
+                        // 忽略错误
                     }
                 }
             }
@@ -105,11 +105,22 @@ class VideoService {
 
         // 方法2：使用 wcdbService.execQuery 查询加密的 hardlink.db
         if (dbPath) {
-            const encryptedDbPaths = [
-                join(dbPath, wxid, 'db_storage', 'hardlink', 'hardlink.db'),
-                join(dbPath, cleanedWxid, 'db_storage', 'hardlink', 'hardlink.db')
-            ]
-
+            // 检查 dbPath 是否已经包含 wxid
+            const dbPathLower = dbPath.toLowerCase()
+            const wxidLower = wxid.toLowerCase()
+            const cleanedWxidLower = cleanedWxid.toLowerCase()
+            const dbPathContainsWxid = dbPathLower.includes(wxidLower) || dbPathLower.includes(cleanedWxidLower)
+            
+            const encryptedDbPaths: string[] = []
+            if (dbPathContainsWxid) {
+                // dbPath 已包含 wxid，不需要再拼接
+                encryptedDbPaths.push(join(dbPath, 'db_storage', 'hardlink', 'hardlink.db'))
+            } else {
+                // dbPath 不包含 wxid，需要拼接
+                encryptedDbPaths.push(join(dbPath, wxid, 'db_storage', 'hardlink', 'hardlink.db'))
+                encryptedDbPaths.push(join(dbPath, cleanedWxid, 'db_storage', 'hardlink', 'hardlink.db'))
+            }
+            
             for (const p of encryptedDbPaths) {
                 if (existsSync(p)) {
                     try {
@@ -129,6 +140,7 @@ class VideoService {
                             }
                         }
                     } catch (e) {
+                        // 忽略错误
                     }
                 }
             }
@@ -155,7 +167,6 @@ class VideoService {
      * 文件命名: {md5}.mp4, {md5}.jpg, {md5}_thumb.jpg
      */
     async getVideoInfo(videoMd5: string): Promise<VideoInfo> {
-
         const dbPath = this.getDbPath()
         const wxid = this.getMyWxid()
 
@@ -166,7 +177,19 @@ class VideoService {
         // 先尝试从数据库查询真正的视频文件名
         const realVideoMd5 = await this.queryVideoFileName(videoMd5) || videoMd5
 
-        const videoBaseDir = join(dbPath, wxid, 'msg', 'video')
+        // 检查 dbPath 是否已经包含 wxid，避免重复拼接
+        const dbPathLower = dbPath.toLowerCase()
+        const wxidLower = wxid.toLowerCase()
+        const cleanedWxid = this.cleanWxid(wxid)
+        
+        let videoBaseDir: string
+        if (dbPathLower.includes(wxidLower) || dbPathLower.includes(cleanedWxid.toLowerCase())) {
+            // dbPath 已经包含 wxid，直接使用
+            videoBaseDir = join(dbPath, 'msg', 'video')
+        } else {
+            // dbPath 不包含 wxid，需要拼接
+            videoBaseDir = join(dbPath, wxid, 'msg', 'video')
+        }
 
         if (!existsSync(videoBaseDir)) {
             return { exists: false }
@@ -202,7 +225,7 @@ class VideoService {
                 }
             }
         } catch (e) {
-            console.error('[VideoService] Error searching for video:', e)
+            // 忽略错误
         }
 
         return { exists: false }

electron/services/wcdbCore.ts

@@ -191,7 +191,7 @@ export class WcdbCore {
   }
 
   private isLogEnabled(): boolean {
-    if (process.env.WEFLOW_WORKER === '1') return false
+    // 移除 Worker 线程的日志禁用逻辑，允许在 Worker 中记录日志
     if (process.env.WCDB_LOG_ENABLED === '1') return true
     return this.logEnabled
   }