增加容错
This commit is contained in:
parent
6aaca06521
commit
37b5749f59
@ -15,7 +15,7 @@ import pymem
|
|||||||
|
|
||||||
from .utils import get_exe_version, get_exe_bit, verify_key
|
from .utils import get_exe_version, get_exe_bit, verify_key
|
||||||
|
|
||||||
ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory
|
ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory if sys.platform == "win32" else None
|
||||||
void_p = ctypes.c_void_p
|
void_p = ctypes.c_void_p
|
||||||
|
|
||||||
|
|
||||||
|
@ -334,7 +334,7 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime:
|
|||||||
bool, str):
|
bool, str):
|
||||||
"""
|
"""
|
||||||
解密合并数据库 msg.db, microMsg.db, media.db,注意:会删除原数据库
|
解密合并数据库 msg.db, microMsg.db, media.db,注意:会删除原数据库
|
||||||
:param wx_path: 微信路径 eg: C:\*******\WeChat Files\wxid_*********
|
:param wx_path: 微信路径 eg: C:\\*******\\WeChat Files\\wxid_*********
|
||||||
:param key: 解密密钥
|
:param key: 解密密钥
|
||||||
:return: (true,解密后的数据库路径) or (false,错误信息)
|
:return: (true,解密后的数据库路径) or (false,错误信息)
|
||||||
"""
|
"""
|
||||||
@ -450,7 +450,7 @@ def all_merge_real_time_db(key, wx_path, merge_path):
|
|||||||
注:这是全量合并,会有可能产生重复数据,需要自行去重
|
注:这是全量合并,会有可能产生重复数据,需要自行去重
|
||||||
:param key: 解密密钥
|
:param key: 解密密钥
|
||||||
:param wx_path: 微信路径
|
:param wx_path: 微信路径
|
||||||
:param merge_path: 合并后的数据库路径 eg: C:\*******\WeChat Files\wxid_*********\merge.db
|
:param merge_path: 合并后的数据库路径 eg: C:\\*******\\WeChat Files\\wxid_*********\\merge.db
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
if not merge_path or not key or not wx_path or not wx_path:
|
if not merge_path or not key or not wx_path or not wx_path:
|
||||||
|
@ -8,10 +8,13 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import hmac
|
import hmac
|
||||||
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
import hashlib
|
import hashlib
|
||||||
from win32com.client import Dispatch
|
if sys.platform == "win32":
|
||||||
|
from win32com.client import Dispatch
|
||||||
|
else:
|
||||||
|
Dispatch = None
|
||||||
|
|
||||||
def info_error(func):
|
def info_error(func):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user