diff --git a/index.py b/index.py
index 4e6689a..03fc475 100644
--- a/index.py
+++ b/index.py
@@ -11,7 +11,7 @@ import ui.resources.resources_rc
from ui.extends.shared.language import changeAppLanguage
from ui.extends.shared.settings import Settings
from ui.implements.mainwindow import MainWindow
-from ui.startup.databaseChecker import DatabaseChecker
+from ui.startup.databaseChecker import DatabaseChecker, DatabaseCheckerResult
logging.basicConfig(
level=logging.INFO,
@@ -32,20 +32,24 @@ if __name__ == "__main__":
changeAppLanguage(locale)
databaseChecker = DatabaseChecker()
- result = databaseChecker.exec()
+ databaseChecker.setWindowIcon(QIcon(":/images/icon.png"))
+ databaseCheckResult = databaseChecker.confirmDb()
- if result == QDialog.DialogCode.Accepted:
- try:
- Database()
- except Exception as e:
- QMessageBox.critical(
- None, "Database Error", "\n".join(traceback.format_exception(e))
- )
+ if not databaseCheckResult & DatabaseCheckerResult.Initted:
+ result = databaseChecker.exec()
+
+ if result == QDialog.DialogCode.Accepted:
+ try:
+ Database()
+ except Exception as e:
+ QMessageBox.critical(
+ None, "Database Error", "\n".join(traceback.format_exception(e))
+ )
+ sys.exit(1)
+ else:
sys.exit(1)
- window = MainWindow()
- window.setWindowIcon(QIcon(":/images/icon.png"))
- window.show()
- sys.exit(app.exec())
- else:
- sys.exit(1)
+ window = MainWindow()
+ window.setWindowIcon(QIcon(":/images/icon.png"))
+ window.show()
+ sys.exit(app.exec())
diff --git a/ui/resources/lang/en_US.ts b/ui/resources/lang/en_US.ts
index e470d7b..59fb82e 100644
--- a/ui/resources/lang/en_US.ts
+++ b/ui/resources/lang/en_US.ts
@@ -89,14 +89,14 @@
Continue
-
- dialog.confirmNewDatabase
- Database file does not exist. Create now?
+
+ dialog.tryInitExistingDatabase
+ The existing database doesn't seem to be initialized properly, try initialize again?
-
- dialog.tryInit
- The existing database doesn't seem to be initialized, try initialize it again?
+
+ dialog.confirmNewDatabase
+ Database file does not exist. Create now?
@@ -567,6 +567,11 @@ validation
About Qt
About Qt
+
+
+ Version Info
+
+
TabDbEntry
diff --git a/ui/resources/lang/zh_CN.ts b/ui/resources/lang/zh_CN.ts
index 3a94fa1..1d74fd2 100644
--- a/ui/resources/lang/zh_CN.ts
+++ b/ui/resources/lang/zh_CN.ts
@@ -89,14 +89,14 @@
继续
-
- dialog.confirmNewDatabase
- 数据库文件不存在，是否创建？
+
+ dialog.tryInitExistingDatabase
+ 现有的数据库似乎没有正确初始化，是否尝试再次初始化？
-
- dialog.tryInit
- 现有的数据库似乎没有正确初始化，是否尝试再次初始化？
+
+ dialog.confirmNewDatabase
+ 数据库文件不存在，是否创建？
@@ -566,6 +566,11 @@
About Qt
关于 Qt
+
+
+ Version Info
+
+
TabDbEntry
diff --git a/ui/startup/databaseChecker.py b/ui/startup/databaseChecker.py
index c86f226..a341406 100644
--- a/ui/startup/databaseChecker.py
+++ b/ui/startup/databaseChecker.py
@@ -1,9 +1,9 @@
import logging
import traceback
-from typing import Literal, Optional, Union
+from enum import IntEnum
from arcaea_offline.database import Database
-from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, Qt, QTimer, QUrl, Slot
+from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, Qt, QUrl, Slot
from PySide6.QtWidgets import QDialog, QMessageBox
from ui.extends.shared.database import create_engine
@@ -14,6 +14,11 @@ from .databaseChecker_ui import Ui_DatabaseChecker
logger = logging.getLogger(__name__)
+class DatabaseCheckerResult(IntEnum):
+ FileExist = 0x001
+ Initted = 0x002
+
+
class DatabaseChecker(Ui_DatabaseChecker, QDialog):
def __init__(self, parent=None):
super().__init__(parent)
@@ -25,9 +30,7 @@ class DatabaseChecker(Ui_DatabaseChecker, QDialog):
self.confirmDbByExistingSettings = False
self.settings = Settings(self)
- dbUrlString = self.settings.databaseUrl()
-
- if dbUrlString:
+ if dbUrlString := self.settings.databaseUrl():
dbFileUrl = QUrl(dbUrlString.replace("sqlite://", "file://"))
dbFileInfo = QFileInfo(dbFileUrl.toLocalFile())
if dbFileInfo.exists():
@@ -42,37 +45,85 @@ class DatabaseChecker(Ui_DatabaseChecker, QDialog):
self.dbDirSelector.selectFile(QDir.currentPath())
self.dbFilenameLineEdit.setText("arcaea_offline.db")
- def updateLabels(
- self,
- version: Union[Optional[int], Literal["reset"]],
- init_status: Union[Optional[bool], Literal["reset"]],
- ):
- if version is not None:
- self.dbVersionLabel.setText(str(version))
- elif version == "reset":
- self.dbVersionLabel.setText("-")
+ def dbPath(self):
+ return QDir(self.dbDirSelector.selectedFiles()[0])
- if init_status is not None:
- if init_status:
- self.dbCheckConnLabel.setText('OK')
- self.continueButton.setEnabled(True)
- else:
- self.dbCheckConnLabel.setText('Error')
- self.continueButton.setEnabled(False)
- elif init_status == "reset":
- self.dbCheckConnLabel.setText("-")
+ def dbFileInfo(self):
+ return QFileInfo(
+ QDir.cleanPath(
+ self.dbPath().absoluteFilePath(self.dbFilenameLineEdit.text())
+ )
+ )
+
+ def dbFileUrl(self):
+ return QUrl.fromLocalFile(self.dbFileInfo().filePath())
+
+ def dbSqliteUrl(self):
+ # dbSqliteUrl.setScheme("sqlite")
+ return QUrl(self.dbFileUrl().toString().replace("file://", "sqlite://"))
+
+ def confirmDb(self) -> DatabaseCheckerResult:
+ flags = 0x000
+
+ dbFileInfo = self.dbFileInfo()
+ dbSqliteUrl = self.dbSqliteUrl()
+ if not dbFileInfo.exists():
+ return flags
+
+ flags |= DatabaseCheckerResult.FileExist
+ db = Database(create_engine(dbSqliteUrl))
+ if db.check_init():
+ flags |= DatabaseCheckerResult.Initted
+
+ return flags
+
+ def updateLabels(self):
+ result = self.confirmDb()
+ try:
+ db = Database()
+ version = db.version()
+ initted = db.check_init()
+ self.dbVersionLabel.setText(str(version))
+ self.dbCheckConnLabel.setText(
+ 'OK'
+ if initted
+ else 'Not initted'
+ )
+ self.continueButton.setEnabled(initted)
+ except Exception as e:
+ self.dbVersionLabel.setText("-")
+ self.dbCheckConnLabel.setText(
+ f'Error: {e}'
+ if result & DatabaseCheckerResult.FileExist
+ else "-"
+ )
self.continueButton.setEnabled(False)
@Slot()
def on_confirmDbPathButton_clicked(self):
- dbPath = QDir(self.dbDirSelector.selectedFiles()[0])
- dbFileInfo = QFileInfo(
- QDir.cleanPath(dbPath.absoluteFilePath(self.dbFilenameLineEdit.text()))
- )
- dbFileUrl = QUrl.fromLocalFile(dbFileInfo.filePath())
- # dbSqliteUrl.setScheme("sqlite")
- dbSqliteUrl = QUrl(dbFileUrl.toString().replace("file://", "sqlite://"))
- if not dbFileInfo.exists():
+ dbSqliteUrl = self.dbSqliteUrl()
+
+ result = self.confirmDb()
+ if result & DatabaseCheckerResult.Initted:
+ if not self.confirmDbByExistingSettings:
+ self.settings.setDatabaseUrl(dbSqliteUrl.toString())
+ elif result & DatabaseCheckerResult.FileExist:
+ confirm_try_init = QMessageBox.question(
+ self,
+ None,
+ # fmt: off
+ QCoreApplication.translate("DatabaseChecker", "dialog.tryInitExistingDatabase"),
+ # fmt: on
+ )
+ if confirm_try_init == QMessageBox.StandardButton.Yes:
+ try:
+ Database().init(checkfirst=True)
+ except Exception as e:
+ logger.exception("Error while initializing an existing database")
+ QMessageBox.critical(
+ self, None, "\n".join(traceback.format_exception(e))
+ )
+ else:
confirm_new_database = QMessageBox.question(
self,
None,
@@ -83,36 +134,7 @@ class DatabaseChecker(Ui_DatabaseChecker, QDialog):
if confirm_new_database == QMessageBox.StandardButton.Yes:
db = Database(create_engine(dbSqliteUrl))
db.init()
- self.on_confirmDbPathButton_clicked()
- else:
- db = Database(create_engine(dbSqliteUrl))
- if db.check_init():
- self.updateLabels(db.version(), True)
- if self.confirmDbByExistingSettings:
- QTimer.singleShot(25, self.accept)
- else:
- self.settings.setDatabaseUrl(dbSqliteUrl.toString())
- else:
- confirm_try_init = QMessageBox.question(
- self,
- None,
- # fmt: off
- QCoreApplication.translate("DatabaseChecker", "dialog.tryInit"),
- # fmt: on
- )
- if confirm_try_init == QMessageBox.StandardButton.Yes:
- try:
- db.init(checkfirst=True)
- except Exception as e:
- logger.exception(
- "Error while initializing an existing database"
- )
- QMessageBox.critical(
- self, None, "\n".join(traceback.format_exception(e))
- )
- self.updateLabels("reset", False)
- finally:
- self.on_confirmDbPathButton_clicked()
+ self.updateLabels()
@Slot()
def on_continueButton_clicked(self):