diff --git a/app/DataBase/hard_link.py b/app/DataBase/hard_link.py index 37a656d..cb3a756 100644 --- a/app/DataBase/hard_link.py +++ b/app/DataBase/hard_link.py @@ -14,13 +14,15 @@ root_path = 'FileStorage/MsgAttach/' @log def get_md5_from_xml(content): - # 解析XML - root = ET.fromstring(content) - # 提取md5的值 - md5_value = root.find(".//img").get("md5") - # print(md5_value) - return md5_value - + try: + # 解析XML + root = ET.fromstring(content) + # 提取md5的值 + md5_value = root.find(".//img").get("md5") + # print(md5_value) + return md5_value + except ET.ParseError: + return None def singleton(cls): _instance = {} diff --git a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py index 80e3ca1..d741a00 100644 --- a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py +++ b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py @@ -171,7 +171,7 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog): # 目标数据库文件 target_database = "app/DataBase/Msg/MSG.db" # 源数据库文件列表 - source_databases = [f"app/DataBase/Msg/MSG{i}.db" for i in range(20)] + source_databases = [f"app/DataBase/Msg/MSG{i}.db" for i in range(1,20)] import shutil shutil.copy("app/DataBase/Msg/MSG0.db", target_database) # 使用一个数据库文件作为模板 # 合并数据库