mirror of
https://github.com/LC044/WeChatMsg
synced 2025-02-22 10:52:18 +08:00
update version,增加错误提示
This commit is contained in:
parent
14590c042b
commit
1035956e5f
@ -1,5 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
from app.log import logger
|
||||||
|
|
||||||
|
|
||||||
def merge_MediaMSG_databases(source_paths, target_path):
|
def merge_MediaMSG_databases(source_paths, target_path):
|
||||||
@ -71,7 +74,7 @@ def merge_databases(source_paths, target_path):
|
|||||||
"VALUES(?,?,?,?,?,?,?,?,?,?,?,?)",
|
"VALUES(?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||||
result)
|
result)
|
||||||
except:
|
except:
|
||||||
pass
|
logger.error(f'数据库合并错误:\n{traceback.format_exc()}')
|
||||||
cursor.close()
|
cursor.close()
|
||||||
db.close()
|
db.close()
|
||||||
# 提交事务
|
# 提交事务
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
version = '1.0.4'
|
version = '1.0.5'
|
||||||
contact = '701805520'
|
contact = '701805520'
|
||||||
github = 'https://github.com/LC044/WeChatMsg'
|
github = 'https://github.com/LC044/WeChatMsg'
|
||||||
website = 'https://memotrace.lc044.love/'
|
website = 'https://memotrace.lc044.love/'
|
||||||
|
@ -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.DataBase import misc_db, micro_msg_db, close_db
|
||||||
from app.ui.Icon import Icon
|
from app.ui.Icon import Icon
|
||||||
from . import mainwindow
|
from . import mainwindow
|
||||||
from app.ui.menu.about_dialog import AboutDialog
|
|
||||||
from .chat import ChatWindow
|
from .chat import ChatWindow
|
||||||
from .contact import ContactWindow
|
from .contact import ContactWindow
|
||||||
from .menu.export import ExportDialog
|
from .menu.export import ExportDialog
|
||||||
@ -28,6 +27,10 @@ from ..components.QCursorGif import QCursorGif
|
|||||||
from ..log import logger
|
from ..log import logger
|
||||||
from ..person import Me
|
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 = """
|
Stylesheet = """
|
||||||
QWidget{
|
QWidget{
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user