cyonjan/PyWxDump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加注释，增加自定义实时合并数据库路径

Browse Source
This commit is contained in:
xaoyaoo 2024-08-13 18:02:24 +08:00
parent ccbcf5878c
commit 8b21c1c6b0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pywxdump/db/__init__.py
View File

@ -16,6 +16,7 @@ from .dbMedia import MediaHandler
from .dbOpenIMContact import OpenIMContactHandler from .dbOpenIMContact import OpenIMContactHandler
from .dbPublicMsg import PublicMsgHandler from .dbPublicMsg import PublicMsgHandler
from .dbOpenIMMedia import OpenIMMediaHandler from .dbOpenIMMedia import OpenIMMediaHandler
from .dbSns import SnsHandler
from .export.exportCSV import export_csv from .export.exportCSV import export_csv
from .export.exportJSON import export_json from .export.exportJSON import export_json

5
pywxdump/wx_core/merge_db.py
View File

@ -15,7 +15,7 @@ from typing import List
from .decryption import batch_decrypt from .decryption import batch_decrypt
from .wx_info import get_core_db 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 @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 from pywxdump import get_core_db
except ImportError: except ImportError:
return False, "未找到模块 pywxdump" return False, "未找到模块 pywxdump"
db_paths = get_core_db(wx_path, DB_TYPE_CORE)
db_paths = get_core_db(wx_path, ["MediaMSG", "MSG", "MicroMsg"])
if not db_paths[0]: if not db_paths[0]:
return False, db_paths[1] return False, db_paths[1]
db_paths = db_paths[1] db_paths = db_paths[1]