From d4562744d03920e7213f336a074dbd5c0ab41dd7 Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Mon, 25 Dec 2023 20:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8D=9F=E5=9D=8F=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98#117?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/merge.py                | 4 ++--
 app/ui/tool/pc_decrypt/pc_decrypt.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py
index 5fecfcb..38caa70 100644
--- a/app/DataBase/merge.py
+++ b/app/DataBase/merge.py
@@ -11,7 +11,7 @@ def merge_MediaMSG_databases(source_paths, target_path):
         target_conn.execute("BEGIN;")
         for i, source_path in enumerate(source_paths):
             if not os.path.exists(source_path):
-                break
+                continue
             db = sqlite3.connect(source_path)
             db.text_factory = str
             cursor = db.cursor()
@@ -52,7 +52,7 @@ def merge_databases(source_paths, target_path):
         target_conn.execute("BEGIN;")
         for i, source_path in enumerate(source_paths):
             if not os.path.exists(source_path):
-                break
+                continue
             db = sqlite3.connect(source_path)
             db.text_factory = str
             cursor = db.cursor()
diff --git a/app/ui/tool/pc_decrypt/pc_decrypt.py b/app/ui/tool/pc_decrypt/pc_decrypt.py
index 59ac865..06aff8d 100644
--- a/app/ui/tool/pc_decrypt/pc_decrypt.py
+++ b/app/ui/tool/pc_decrypt/pc_decrypt.py
@@ -230,7 +230,7 @@ class DecryptThread(QThread):
         # 目标数据库文件
         target_database = "app/DataBase/Msg/MSG.db"
         # 源数据库文件列表
-        source_databases = [f"app/DataBase/Msg/MSG{i}.db" for i in range(1, 200)]
+        source_databases = [f"app/DataBase/Msg/MSG{i}.db" for i in range(1, 50)]
         import shutil
         if os.path.exists(target_database):
             os.remove(target_database)
@@ -246,7 +246,7 @@ class DecryptThread(QThread):
         # 源数据库文件列表
         if os.path.exists(target_database):
             os.remove(target_database)
-        source_databases = [f"app/DataBase/Msg/MediaMSG{i}.db" for i in range(1, 200)]
+        source_databases = [f"app/DataBase/Msg/MediaMSG{i}.db" for i in range(1, 50)]
         shutil.copy2("app/DataBase/Msg/MediaMSG0.db", target_database)  # 使用一个数据库文件作为模板
         # 合并数据库
         try: