From 86886f50f2ffb19680ae136d92d348c21d94888b Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Sat, 10 Aug 2024 23:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=B6=88=E6=81=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/wx_core/merge_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pywxdump/wx_core/merge_db.py b/pywxdump/wx_core/merge_db.py index 324dcb8..1d9c2ef 100644 --- a/pywxdump/wx_core/merge_db.py +++ b/pywxdump/wx_core/merge_db.py @@ -456,7 +456,7 @@ 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): +def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path=None): """ 合并所有实时数据库 注：这是全量合并，会有可能产生重复数据，需要自行去重 @@ -476,7 +476,7 @@ def all_merge_real_time_db(key, wx_path, merge_path: str): if not db_paths[0]: return False, db_paths[1] db_paths = db_paths[1] - code, ret = merge_real_time_db(key=key, merge_path=merge_path, db_paths=db_paths, real_time_exe_path=None) + code, ret = merge_real_time_db(key=key, merge_path=merge_path, db_paths=db_paths, real_time_exe_path=real_time_exe_path) if code: return True, merge_path else: