From 424d6bd49b7c62e37020bd8d20c95c675bed3c8e Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Sat, 20 Jul 2024 19:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E9=80=9Fmerge=5Fdb=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/wx_info/merge_db.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py index 7b0ea45..01e0941 100644 --- a/pywxdump/wx_info/merge_db.py +++ b/pywxdump/wx_info/merge_db.py @@ -16,6 +16,7 @@ from typing import List def merge_copy_db(db_path, save_path): + logging.warning("merge_copy_db is deprecated, use merge_db instead, will be removed in the future.") if isinstance(db_path, list) and len(db_path) == 1: db_path = db_path[0] if not os.path.exists(db_path): @@ -25,6 +26,7 @@ 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位时间戳 + logging.warning("merge_msg_db is deprecated, use merge_db instead, will be removed in the future.") # 判断save_path是否为文件夹 if os.path.isdir(save_path): save_path = os.path.join(save_path, "merge_MSG.db") @@ -120,6 +122,7 @@ 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): + logging.warning("merge_media_msg_db is deprecated, use merge_db instead, will be removed in the future.") # 判断save_path是否为文件夹 if os.path.isdir(save_path): save_path = os.path.join(save_path, "merge_Media.db") @@ -199,7 +202,7 @@ def execute_sql(connection, sql, params=None): connection.text_factory = str return rdata except Exception as e: - print(f"**********\nSQL: {sql}\nparams: {params}\n{e}\n**********") + logging.error(f"**********\nSQL: {sql}\nparams: {params}\n{e}\n**********", exc_info=True) return None