diff --git a/README.md b/README.md index c9dbde18..514bfc34 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,14 @@ [![PyPI](https://img.shields.io/pypi/v/pywxdump)](https://pypi.org/project/pywxdump/) [![Wheel](https://img.shields.io/pypi/wheel/pywxdump)](https://pypi.org/project/pywxdump/) -[![PyPI-Downloads](https://img.shields.io/pypi/dm/pywxdump)](https://pypi.org/project/pywxdump/) +[![PyPI-Downloads](https://img.shields.io/pypi/dm/pywxdump)](https://pypistats.org/packages/pywxdump) [![GitHub license](https://img.shields.io/pypi/l/pywxdump)](https://github.com/xaoyaoo/PyWxDump/blob/master/LICENSE) [![Publish](https://github.com/xaoyaoo/PyWxDump/actions/workflows/publish.yml/badge.svg)](https://github.com/xaoyaoo/PyWxDump/actions/workflows/publish.yml)
更新日志(点击展开): +* 2023.11.14 修复部分bug * 2023.11.11 添加聊天记录解析,查看工具,修复部分bug * 2023.11.10 修复wxdump wx_db命令行参数错误 [#19](https://github.com/xaoyaoo/PyWxDump/issues/19) * 2023.11.08 增加3.9.8.15版本支持 diff --git a/pywxdump/decrypted/get_wx_decrypted_db.py b/pywxdump/decrypted/get_wx_decrypted_db.py index 32953ca1..ad932a01 100644 --- a/pywxdump/decrypted/get_wx_decrypted_db.py +++ b/pywxdump/decrypted/get_wx_decrypted_db.py @@ -231,7 +231,7 @@ def merge_media_msg_db(db_path: list, save_path: str): merged_cursor.execute(s) r0 = merged_cursor.fetchall() - ex_sql = f"select * from {tblname} where Reserved0 not in ({','.join([str(r[0]) for r in r0])})" + ex_sql = f"select `Key`,Reserved0,Buf,Reserved1,Reserved2 from {tblname} where Reserved0 not in ({','.join([str(r[0]) for r in r0])})" cursor.execute(ex_sql) data = cursor.fetchall() diff --git a/setup.py b/setup.py index f4d4c7c4..45bcb8b6 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() -version = "2.2.1" +version = "2.2.2" setup( name="pywxdump", author="xaoyaoo",