From db417dc48f967cfee144b8d9130aa0b289995a03 Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Mon, 4 Dec 2023 18:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E8=AE=B0=E5=BD=95=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98#48=20#36?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/hard_link.py               | 16 +++++++++-------
 app/ui_pc/tool/pc_decrypt/pc_decrypt.py |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/DataBase/hard_link.py b/app/DataBase/hard_link.py
index 37a656d7..cb3a7562 100644
--- a/app/DataBase/hard_link.py
+++ b/app/DataBase/hard_link.py
@@ -14,13 +14,15 @@
 
 @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 80e3ca11..d741a00c 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 @@ def btnExitClicked(self):
             # 目标数据库文件
         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)  # 使用一个数据库文件作为模板
         # 合并数据库