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

增加注释，增加自定义实时合并数据库路径

Browse Source
This commit is contained in:
xaoyaoo 2024-08-13 17:47:25 +08:00
parent 1922c1da39
commit ccbcf5878c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pywxdump/api/local_server.py
View File

@ -207,7 +207,10 @@ def get_real_time_msg():
if not merge_path or not key or not wx_path or not wx_path:
return ReJson(1002, body="msg_path or media_path or wx_path or key is required")
code, ret = all_merge_real_time_db(key=key, wx_path=wx_path, merge_path=merge_path)
real_time_exe_path = get_conf(g.caf, g.at, "real_time_exe_path")
code, ret = all_merge_real_time_db(key=key, wx_path=wx_path, merge_path=merge_path,
real_time_exe_path=real_time_exe_path)
if code:
return ReJson(0, ret)
else:

5
pywxdump/wx_core/merge_db.py
View File

@ -393,7 +393,7 @@ def decrypt_merge(wx_path: str, key: str, outpath: str = "",
@wx_core_error
def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time_exe_path=None):
def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time_exe_path: str = None):
"""
合并实时数据库消息,暂时只支持64位系统
:param key: 解密密钥
@ -451,13 +451,14 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time
@wx_core_error
def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path=None):
def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path: str = None):
"""
合并所有实时数据库
注：这是全量合并，会有可能产生重复数据，需要自行去重
:param key: 解密密钥
:param wx_path: 微信路径
:param merge_path: 合并后的数据库路径 eg: C:\\*******\\WeChat Files\\wxid_*********\\merge.db
:param real_time_exe_path: 实时数据库合并工具路径
:return:
"""
if not merge_path or not key or not wx_path or not wx_path: