cyonjan/PyWxDump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
xaoyaoo 2024-05-19 20:59:30 +08:00
parent d4ed7eafec
commit a0e7fc4519
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pywxdump/wx_info/merge_db.py
View File

@ -319,10 +319,9 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime:
# 分割wx_path的文件名和父目录 # 分割wx_path的文件名和父目录
msg_dir = os.path.dirname(wx_path) msg_dir = os.path.dirname(wx_path)
my_wxid = os.path.basename(wx_path) my_wxid = os.path.basename(wx_path)
db_type = ["MSG", "MediaMSG", "MicroMsg", "OpenIMContact", "OpenIMMedia", "OpenIMMsg", "Favorite"]
# 解密 # 解密
code, wxdbpaths = get_core_db(wx_path, ["MSG", "MediaMSG", "MicroMsg", "OpenIMContact", "OpenIMMedia", code, wxdbpaths = get_core_db(wx_path, db_type)
"OpenIMMsg", "Favorite"])
if not code: if not code:
return False, wxdbpaths return False, wxdbpaths
# 判断out_path是否为空目录 # 判断out_path是否为空目录
@ -345,9 +344,14 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime:
for code1, ret1 in ret: for code1, ret1 in ret:
if code1: if code1:
out_dbs.append(ret1[1]) out_dbs.append(ret1[1])
parpare_merge_db_path = []
parpare_merge_db_path = [i for i in out_dbs if for i in out_dbs:
"de_MicroMsg" in i or "de_MediaMSG" in i or "de_MSG" in i or "de_OpenIMMsg" in i or "de_OpenIMMedia" in i or "de_OpenIMContact" in i] for j in db_type:
if j in i:
parpare_merge_db_path.append(i)
break
de_db_type = [f"de_{i}" for i in db_type]
parpare_merge_db_path = [i for i in out_dbs if any(keyword in i for keyword in de_db_type)]
merge_save_path = merge_db(parpare_merge_db_path, merge_save_path, CreateTime=CreateTime, merge_save_path = merge_db(parpare_merge_db_path, merge_save_path, CreateTime=CreateTime,
endCreateTime=endCreateTime) endCreateTime=endCreateTime)