diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py index 38caa70..c8798a7 100644 --- a/app/DataBase/merge.py +++ b/app/DataBase/merge.py @@ -1,5 +1,8 @@ import os import sqlite3 +import traceback + +from app.log import logger def merge_MediaMSG_databases(source_paths, target_path): @@ -71,7 +74,7 @@ def merge_databases(source_paths, target_path): "VALUES(?,?,?,?,?,?,?,?,?,?,?,?)", result) except: - pass + logger.error(f'数据库合并错误:\n{traceback.format_exc()}') cursor.close() db.close() # 提交事务 diff --git a/app/config.py b/app/config.py index 930a064..06083d6 100644 --- a/app/config.py +++ b/app/config.py @@ -1,4 +1,4 @@ -version = '1.0.4' +version = '1.0.5' contact = '701805520' github = 'https://github.com/LC044/WeChatMsg' website = 'https://memotrace.lc044.love/' diff --git a/app/ui/mainview.py b/app/ui/mainview.py index cb8661d..29fd4d5 100644 --- a/app/ui/mainview.py +++ b/app/ui/mainview.py @@ -18,7 +18,6 @@ from PyQt5.QtWidgets import QMainWindow, QLabel, QListWidgetItem, QMessageBox from app.DataBase import misc_db, micro_msg_db, close_db from app.ui.Icon import Icon from . import mainwindow -from app.ui.menu.about_dialog import AboutDialog from .chat import ChatWindow from .contact import ContactWindow from .menu.export import ExportDialog @@ -28,6 +27,10 @@ from ..components.QCursorGif import QCursorGif from ..log import logger from ..person import Me +try: + from app.ui.menu.about_dialog import AboutDialog +except ModuleNotFoundError: + logger.error(f'Python版本错误:Python>=3.10,仅支持3.10、3.11、3.12') # 美化样式表 Stylesheet = """ QWidget{ diff --git a/app/ui/menu/about_dialog.cp310-win_amd64.pyd b/app/ui/menu/about_dialog.cp310-win_amd64.pyd index 1eb8fff..7b395e3 100644 Binary files a/app/ui/menu/about_dialog.cp310-win_amd64.pyd and b/app/ui/menu/about_dialog.cp310-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp311-win_amd64.pyd b/app/ui/menu/about_dialog.cp311-win_amd64.pyd index bf7f6db..b998fda 100644 Binary files a/app/ui/menu/about_dialog.cp311-win_amd64.pyd and b/app/ui/menu/about_dialog.cp311-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp312-win_amd64.pyd b/app/ui/menu/about_dialog.cp312-win_amd64.pyd index 8350a33..fea8a6f 100644 Binary files a/app/ui/menu/about_dialog.cp312-win_amd64.pyd and b/app/ui/menu/about_dialog.cp312-win_amd64.pyd differ