From 1ced36f7e3ea62db4f776d315631841315e66c28 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Tue, 23 Jan 2024 11:22:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A8=E8=A7=A3=E5=AF=86?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E4=B8=BB=E8=A6=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/cli.py                 | 1 +
 pywxdump/wx_info/get_wx_info.py | 3 ++-
 pywxdump/wx_info/merge_db.py    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pywxdump/cli.py b/pywxdump/cli.py
index 24fa0eb..93c5e3d 100644
--- a/pywxdump/cli.py
+++ b/pywxdump/cli.py
@@ -65,6 +65,7 @@ class MainWxInfo():
         return sb_wx_info
 
     def run(self, args):
+        print(f"[*] PyWxDump v{pywxdump.__version__}")
         # 读取微信各版本偏移
         path = args.version_list_path
         save_path = args.save_path
diff --git a/pywxdump/wx_info/get_wx_info.py b/pywxdump/wx_info/get_wx_info.py
index 5a34d4b..99c67bb 100644
--- a/pywxdump/wx_info/get_wx_info.py
+++ b/pywxdump/wx_info/get_wx_info.py
@@ -304,10 +304,11 @@ def get_core_db(wx_path: str, db_type: list = None) -> [str]:
         return False, f"[-] 目录不存在: {wx_path}"
     db_type_all = ["MSG", "MediaMSG", "MicroMsg"]
 
-    db_type = [dt for dt in db_type if dt in db_type_all]
     if not db_type:
         db_type = db_type_all
 
+    db_type = [dt for dt in db_type if dt in db_type_all]
+
     msg_dir = os.path.dirname(wx_path)
     my_wxid = os.path.basename(wx_path)
     WxDbPath = get_wechat_db('all', msg_dir, wxid=my_wxid, is_logging=False)  # 获取微信数据库路径
diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py
index 58c15db..e637d95 100644
--- a/pywxdump/wx_info/merge_db.py
+++ b/pywxdump/wx_info/merge_db.py
@@ -301,7 +301,7 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime:
     my_wxid = os.path.basename(wx_path)
 
     # 解密
-    code, wxdbpaths = get_core_db(wx_path)
+    code, wxdbpaths = get_core_db(wx_path, ["MSG", "MediaMSG", "MicroMsg"])
 
     # 判断out_path是否为空目录
     if os.path.exists(decrypted_path) and os.listdir(decrypted_path):