From cac5a4d1a72a7ceda087de3f1ba1852cb628ba08 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Sun, 19 May 2024 15:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=97=8F=E5=A4=B9?= =?UTF-8?q?=E7=9A=84=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/wx_info/merge_db.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py index 6ebefcd..51c435a 100644 --- a/pywxdump/wx_info/merge_db.py +++ b/pywxdump/wx_info/merge_db.py @@ -247,7 +247,8 @@ def merge_db(db_paths, save_path="merge.db", CreateTime: int = 0, endCreateTime: if not columns or len(columns) < 1: continue col_type = { - (i[1] if isinstance(i[1], str) else i[1].decode(), i[2] if isinstance(i[2], str) else i[2].decode()) for + (i[1] if isinstance(i[1], str) else i[1].decode(), i[2] if isinstance(i[2], str) else i[2].decode()) + for i in columns} columns = [i[1] if isinstance(i[1], str) else i[1].decode() for i in columns] if not columns or len(columns) < 1: @@ -320,7 +321,8 @@ 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, ["MSG", "MediaMSG", "MicroMsg", "OpenIMContact", "OpenIMMedia", "OpenIMMsg", "Favorite"]) + code, wxdbpaths = get_core_db(wx_path, ["MSG", "MediaMSG", "MicroMsg", "OpenIMContact", "OpenIMMedia", + "OpenIMMsg", "Favorite"]) if not code: return False, wxdbpaths # 判断out_path是否为空目录