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]