From ef34c46bfaf175cd86c7d933679a5bb5ae352628 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Thu, 18 Jul 2024 21:08:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=9B=BE=E7=89=87=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/api/api.py | 3 ++- pywxdump/dbpreprocess/utils.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py index b6dec7c..d6ed166 100644 --- a/pywxdump/api/api.py +++ b/pywxdump/api/api.py @@ -374,7 +374,8 @@ def get_img(img_path): img_tmp_path = os.path.join(g.tmp_path, my_wxid, "img") original_img_path = os.path.join(wx_path, img_path) if os.path.exists(original_img_path): - fomt, md5, out_bytes = dat2img(original_img_path) + rc, fomt, md5, out_bytes = dat2img(original_img_path) + imgsavepath = os.path.join(img_tmp_path, img_path + "_" + ".".join([md5, fomt])) if not os.path.exists(os.path.dirname(imgsavepath)): os.makedirs(os.path.dirname(imgsavepath)) diff --git a/pywxdump/dbpreprocess/utils.py b/pywxdump/dbpreprocess/utils.py index 78e4a4e..9f4d900 100644 --- a/pywxdump/dbpreprocess/utils.py +++ b/pywxdump/dbpreprocess/utils.py @@ -170,8 +170,8 @@ def dat2img(input_data): out_bytes = np.bitwise_xor(input_bytes, t) # 使用NumPy进行向量化的异或解密操作 md5 = get_md5(out_bytes) - return fomt, md5, out_bytes - return False + return False, fomt, md5, out_bytes + return False, False, False, False except ImportError: pass @@ -185,8 +185,8 @@ def dat2img(input_data): newByte = nowByte ^ t # 异或解密 out_bytes.append(newByte) md5 = get_md5(out_bytes) - return fomt, md5, out_bytes - return False + return True, fomt, md5, out_bytes + return False, False, False, False def xml2dict(xml_string):