修复bug

pywxdump/__init__.py

@@ -22,4 +22,4 @@ except:
     VERSION_LIST = {}
     VERSION_LIST_PATH = None
 
-__version__ = "2.3.29"
+__version__ = "2.4.0"

pywxdump/cli.py

@@ -8,6 +8,7 @@
 import argparse
 import os
 import sys
+import time
 
 from pywxdump import *
 import pywxdump
@@ -291,7 +292,8 @@ class MainAll():
         # 获取微信信息
         save_path = args.save_path
         WxInfo = read_info(VERSION_LIST, True, save_path)
-
+        if isinstance(WxInfo, str):  # 如果返回的是字符串，则表示出错
+            return
         for user in WxInfo:
             key = user.get("key", "")
             if not key:
@@ -365,14 +367,15 @@ class MainAll():
             # 合并所有的数据库
             print(f"[*] 合并数据库中...（用时较久，耐心等待）")
             merge_save_path = merge_db(parpare_merge_db_path, os.path.join(out_path, "merge_all.db"))
-
+            time.sleep(1)
-            FileStorage_path = os.path.join(filePath, "FileStorage") if filePath else "FileStorage"
+            print(f"[+] 合并完成：{merge_save_path}")
-
+            print("=" * 32)
             # # 查看聊天记录
             args.msg_path = merge_save_path
             args.micro_path = merge_save_path
             args.media_path = merge_save_path
-            args.filestorage_path = FileStorage_path
+            args.wxid_path = filePath
+            args.my_wxid = wxid
             MainShowChatRecords().run(args)
 
 

pywxdump/server.py

@@ -19,12 +19,12 @@ CORS(app, resources={r"/*": {"origins": "*"}}, supports_credentials=True)  # 允
 
 @app.before_request
 def before_request():
-    path = r"D:\_code\py_code\test\a2023\b0821wxdb\merge_wfwx_db\kkWxMsg\MSG_all.db"
+    path = r"****.db"
     g.msg_path = path
     g.micro_path = path
     g.media_path = path
-    g.wxid_path = r"C:\Users\xaoyo\Documents\Tencent\WeChat Files\wxid_vzzcn5fevion22"
+    g.wxid_path = r"*****"
-    g.my_wxid = "wxid_vzzcn5fevion22"
+    g.my_wxid = "******"
     g.tmp_path = "dist"  # 临时文件夹,用于存放图片等
     g.user_list = []
 

pywxdump/ui/web/assets/BiasView-GJ4usZ7i.js

@@ -0,0 +1 @@
+import{_ as o,b as s,c,e,h as t}from"./index-ct5HAHRh.js";const a={},n={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},r=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),i=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[r,i];function d(h,l){return s(),c("div",n,_)}const f=o(a,[["render",d]]);export{f as default};

pywxdump/ui/web/assets/DecryptView-u74EqMxx.js

@@ -0,0 +1 @@
+import{_ as o,b as c,c as s,e,h as t}from"./index-ct5HAHRh.js";const a={},r={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},n=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),i=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[n,i];function d(h,l){return c(),s("div",r,_)}const f=o(a,[["render",d]]);export{f as default};

pywxdump/ui/web/assets/ExportView-LXLUt7GL.js

@@ -0,0 +1 @@
+import{_ as o,b as c,c as s,e,h as t}from"./index-ct5HAHRh.js";const a={},r={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},n=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),i=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[n,i];function d(h,l){return c(),s("div",r,_)}const x=o(a,[["render",d]]);export{x as default};

pywxdump/ui/web/assets/MergeView-u74EqMxx.js

@@ -0,0 +1 @@
+import{_ as o,b as c,c as s,e,h as t}from"./index-ct5HAHRh.js";const a={},r={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},n=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),i=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[n,i];function d(h,l){return c(),s("div",r,_)}const f=o(a,[["render",d]]);export{f as default};

pywxdump/ui/web/assets/StatisticsView-v-n8Q3Re.js

@@ -0,0 +1 @@
+import{_ as o,b as s,c,e,h as t}from"./index-ct5HAHRh.js";const a={},i={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},n=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),r=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[n,r];function d(h,l){return s(),c("div",i,_)}const f=o(a,[["render",d]]);export{f as default};

pywxdump/ui/web/assets/WxinfoView-T1JKlNEu.js

@@ -0,0 +1 @@
+import{_ as o,b as c,c as s,e,h as t}from"./index-ct5HAHRh.js";const a={},n={style:{"background-color":"#d2d2fa",height:"100vh",display:"grid","place-items":"center"}},r=e("h2",{style:{"text-align":"center"}},[t("欢迎使用"),e("a",{href:"https://github.com/xaoyaoo/PyWxDump.git"},"PyWxDump"),t("聊天记录查看工具! ")],-1),i=e("p",null,"如需提前体验更多功能，请开通超级vip",-1),_=[r,i];function d(h,l){return c(),s("div",n,_)}const f=o(a,[["render",d]]);export{f as default};