From 8b21c1c6b0a29cfb103398b33f23e2aefd233668 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Tue, 13 Aug 2024 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE=E5=BA=93=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/db/__init__.py | 1 + pywxdump/wx_core/merge_db.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pywxdump/db/__init__.py b/pywxdump/db/__init__.py index 13fea73..2840cb5 100644 --- a/pywxdump/db/__init__.py +++ b/pywxdump/db/__init__.py @@ -16,6 +16,7 @@ from .dbMedia import MediaHandler from .dbOpenIMContact import OpenIMContactHandler from .dbPublicMsg import PublicMsgHandler from .dbOpenIMMedia import OpenIMMediaHandler +from .dbSns import SnsHandler from .export.exportCSV import export_csv from .export.exportJSON import export_json diff --git a/pywxdump/wx_core/merge_db.py b/pywxdump/wx_core/merge_db.py index 29e0464..ad773ac 100644 --- a/pywxdump/wx_core/merge_db.py +++ b/pywxdump/wx_core/merge_db.py @@ -15,7 +15,7 @@ from typing import List from .decryption import batch_decrypt from .wx_info import get_core_db -from .utils import wx_core_loger, wx_core_error +from .utils import wx_core_loger, wx_core_error, DB_TYPE_CORE @wx_core_error @@ -467,8 +467,7 @@ def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path: st from pywxdump import get_core_db except ImportError: return False, "未找到模块 pywxdump" - - db_paths = get_core_db(wx_path, ["MediaMSG", "MSG", "MicroMsg"]) + db_paths = get_core_db(wx_path, DB_TYPE_CORE) if not db_paths[0]: return False, db_paths[1] db_paths = db_paths[1]