From d091ba38d793ab87f57f7c501dea398ed7867759 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Sat, 9 Dec 2023 22:37:12 +0800 Subject: [PATCH] =?UTF-8?q?merge=20=E8=BE=93=E5=87=BA=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=96=87=E4=BB=B6=EF=BC=8C=E5=88=99=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6?= 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, 6 insertions(+) diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py index 30da3cd..acb7d5a 100644 --- a/pywxdump/wx_info/merge_db.py +++ b/pywxdump/wx_info/merge_db.py @@ -20,6 +20,9 @@ def merge_copy_db(db_path, save_path): # 合并相同名称的数据库 MSG0-MSG9.db def merge_msg_db(db_path: list, save_path: str, CreateTime: int = 0): # CreateTime: 从这个时间开始的消息 10位时间戳 + # 判断save_path是否为文件夹 + if os.path.isdir(save_path): + save_path = os.path.join(save_path, "merge_MSG.db") merged_conn = sqlite3.connect(save_path) merged_cursor = merged_conn.cursor() @@ -112,6 +115,9 @@ def merge_msg_db(db_path: list, save_path: str, CreateTime: int = 0): # CreateT def merge_media_msg_db(db_path: list, save_path: str): + # 判断save_path是否为文件夹 + if os.path.isdir(save_path): + save_path = os.path.join(save_path, "merge_Media.db") merged_conn = sqlite3.connect(save_path) merged_cursor = merged_conn.cursor()