refactor: moving ui.extends to core

* Settings and Singletons moved

ui/extends/shared/data.py

@@ -7,7 +7,7 @@ from typing import Literal, Optional, overload
 from arcaea_offline.models import Chart, Difficulty, Song
 from PySide6.QtCore import QFile
 
-from .singleton import Singleton
+from core.singleton import Singleton
 
 TPartnerModifier = dict[str, Literal[0, 1, 2]]
 
@@ -48,14 +48,12 @@ class Data(metaclass=Singleton):
         return self.dataPath / "Arcaea"
 
     @overload
-    def getJacketPath(self, chart: Chart, /) -> Path | None:
-        ...
+    def getJacketPath(self, chart: Chart, /) -> Path | None: ...
 
     @overload
     def getJacketPath(
         self, song: Song, difficulty: Optional[Difficulty] = None, /
-    ) -> Path | None:
-        ...
+    ) -> Path | None: ...
 
     def getJacketPath(self, *args) -> Path | None:
         if isinstance(args[0], Chart):

ui/extends/shared/settings.py

@@ -1,122 +0,0 @@
-import sys
-
-from PySide6.QtCore import QFileInfo, QSettings, Signal
-
-from .singleton import QObjectSingleton
-
-__all__ = [
-    "LANGUAGE",
-    "DATABASE_URL",
-    "KNN_MODEL_FILE",
-    "B30_KNN_MODEL_FILE",
-    "PHASH_DATABASE_FILE",
-    "SCORE_DATE_SOURCE",
-    "ANDREAL_FOLDER",
-    "ANDREAL_EXECUTABLE",
-    "Settings",
-]
-
-# a key without slashes will appear in the "General" section
-# see https://doc.qt.io/qt-6/qsettings.html#Format-enum for details
-LANGUAGE = "Language"
-DATABASE_URL = "DatabaseUrl"
-
-KNN_MODEL_FILE = "Ocr/KnnModelFile"
-B30_KNN_MODEL_FILE = "Ocr/B30KnnModelFile"
-PHASH_DATABASE_FILE = "Ocr/PHashDatabaseFile"
-SCORE_DATE_SOURCE = "Ocr/DateSource"
-
-ANDREAL_FOLDER = "Andreal/AndrealFolder"
-ANDREAL_EXECUTABLE = "Andreal/AndrealExecutable"
-
-
-class Settings(QSettings, metaclass=QObjectSingleton):
-    updated = Signal(str)
-
-    def __init__(self, parent=None):
-        super().__init__(
-            QFileInfo(sys.argv[0]).dir().absoluteFilePath("arcaea_offline.ini"),
-            QSettings.Format.IniFormat,
-            parent,
-        )
-
-    def setValue(self, key: str, value) -> None:
-        super().setValue(key, value)
-        self.updated.emit(key)
-
-    def _strItem(self, key: str) -> str | None:
-        return self.value(key, None, str)
-
-    def _setStrItem(self, key: str, value: str):
-        self.setValue(key, value)
-        self.sync()
-
-    def _resetStrItem(self, key: str):
-        self.setValue(key, None)
-        self.sync()
-
-    def language(self):
-        return self._strItem(LANGUAGE)
-
-    def setLanguage(self, value: str):
-        self._setStrItem(LANGUAGE, value)
-
-    def databaseUrl(self):
-        return self._strItem(DATABASE_URL)
-
-    def setDatabaseUrl(self, value: str):
-        self._setStrItem(DATABASE_URL, value)
-
-    def knnModelFile(self):
-        return self._strItem(KNN_MODEL_FILE)
-
-    def setKnnModelFile(self, value: str):
-        self._setStrItem(KNN_MODEL_FILE, value)
-
-    def resetKnnModelFile(self):
-        self._resetStrItem(KNN_MODEL_FILE)
-
-    def b30KnnModelFile(self):
-        return self._strItem(B30_KNN_MODEL_FILE)
-
-    def setB30KnnModelFile(self, value: str):
-        self._setStrItem(B30_KNN_MODEL_FILE, value)
-
-    def resetB30KnnModelFile(self):
-        self._resetStrItem(B30_KNN_MODEL_FILE)
-
-    def phashDatabaseFile(self):
-        return self._strItem(PHASH_DATABASE_FILE)
-
-    def setPHashDatabaseFile(self, value: str):
-        self._setStrItem(PHASH_DATABASE_FILE, value)
-
-    def resetPHashDatabaseFile(self):
-        self._resetStrItem(PHASH_DATABASE_FILE)
-
-    def scoreDateSource(self):
-        return self._strItem(SCORE_DATE_SOURCE)
-
-    def setScoreDateSource(self, value: str):
-        self._setStrItem(SCORE_DATE_SOURCE, value)
-
-    def resetScoreDateSource(self):
-        self._resetStrItem(SCORE_DATE_SOURCE)
-
-    def andrealFolder(self):
-        return self._strItem(ANDREAL_FOLDER)
-
-    def setAndrealFolder(self, value: str):
-        self._setStrItem(ANDREAL_FOLDER, value)
-
-    def resetAndrealFolder(self):
-        self._resetStrItem(ANDREAL_FOLDER)
-
-    def andrealExecutable(self):
-        return self._strItem(ANDREAL_EXECUTABLE)
-
-    def setAndrealExecutable(self, value: str):
-        self._setStrItem(ANDREAL_EXECUTABLE, value)
-
-    def resetAndrealExecutable(self):
-        self._resetStrItem(ANDREAL_EXECUTABLE)

ui/extends/shared/singleton.py

@@ -1,18 +0,0 @@
-from typing import Generic, TypeVar
-
-from PySide6.QtCore import QObject
-
-T = TypeVar("T")
-
-
-class Singleton(type, Generic[T]):
-    _instance = None
-
-    def __call__(cls, *args, **kwargs) -> T:
-        if cls._instance is None:
-            cls._instance = super().__call__(*args, **kwargs)
-        return cls._instance
-
-
-class QObjectSingleton(type(QObject), Singleton):
-    pass

ui/extends/tabs/tabOcr/tabOcr_Device.py

@@ -19,9 +19,9 @@ from arcaea_offline_ocr.phash_db import ImagePhashDatabase
 from arcaea_offline_ocr.utils import imread_unicode
 from PySide6.QtCore import QDateTime, QFileInfo
 
+from core.settings import SettingsKeys, SettingsValues, settings
 from ui.extends.components.ocrQueue import OcrRunnable
 from ui.extends.shared.data import Data
-from ui.extends.shared.settings import Settings
 
 logger = logging.getLogger(__name__)
 
@@ -70,8 +70,8 @@ def getImageDate(imagePath: str) -> QDateTime:
             datetime = QDateTime.fromString(datetimeStr, "yyyy:MM:dd hh:mm:ss")
 
     if not isinstance(datetime, QDateTime):
-        dateSource = Settings().scoreDateSource()
-        if dateSource == "lastModified":
+        dateSource = settings.stringValue(SettingsKeys.Ocr.DateSource)
+        if dateSource == SettingsValues.Ocr.DateSource.FileLastModified:
             datetime = QFileInfo(imagePath).lastModified()
         else:
             datetime = QFileInfo(imagePath).birthTime()