feat: fix review items

Author: python357-1

requirements.txt

@@ -19,4 +19,4 @@ ujson>=5.8.0,<=5.9.0
 vtf2img==0.1.0
 toml==0.10.2
 appdirs==1.4.4
-pydantic==2.10.4
+pydantic==2.10.4

tagstudio/src/core/library/alchemy/library.py

@@ -50,6 +50,7 @@
     TextField,
     _FieldID,
 )
+from ...settings import LibSettings
 from .joins import TagField, TagSubtag
 from .models import Entry, Folder, Preferences, Tag, TagAlias, ValueType
 from .visitors import SQLBoolExpressionBuilder
@@ -137,6 +138,7 @@ class Library:
     engine: Engine | None
     folder: Folder | None
     included_files: set[Path] = set()
+    settings: LibSettings | None = None
 
     SQL_FILENAME: str = "ts_library.sqlite"
     JSON_FILENAME: str = "ts_library.json"
@@ -200,8 +202,8 @@ def migrate_json_to_sqlite(self, json_lib: JsonLibrary):
                     )
 
         # Preferences
-        self.set_prefs(LibraryPrefs.EXTENSION_LIST, [x.strip(".") for x in json_lib.ext_list])
-        self.set_prefs(LibraryPrefs.IS_EXCLUDE_LIST, json_lib.is_exclude_list)
+        self.settings.extension_list = [ x.strip(".") for x in json_lib.ext_list]
+        self.settings.is_exclude_list = json_lib.is_exclude_list
 
         end_time = time.time()
         logger.info(f"Library Converted! ({format_timespan(end_time-start_time)})")
@@ -220,6 +222,9 @@ def open_library(self, library_dir: Path, storage_path: str | None = None) -> Li
             return self.open_sqlite_library(library_dir, is_new)
         else:
             self.storage_path = library_dir / TS_FOLDER_NAME / self.SQL_FILENAME
+            settings_path = library_dir / TS_FOLDER_NAME / "libsettings.toml"
+
+            self.settings = LibSettings.open(settings_path)
 
             if self.verify_ts_folder(library_dir) and (is_new := not self.storage_path.exists()):
                 json_path = library_dir / TS_FOLDER_NAME / self.JSON_FILENAME
@@ -547,10 +552,9 @@ def search_library(
                     SQLBoolExpressionBuilder(self).visit(search.ast)
                 )
 
-            extensions = self.prefs(LibraryPrefs.EXTENSION_LIST)
-            is_exclude_list = self.prefs(LibraryPrefs.IS_EXCLUDE_LIST)
+            extensions = self.settings.extension_list
 
-            if extensions and is_exclude_list:
+            if extensions and self.settings.is_exclude_list:
                 statement = statement.where(Entry.suffix.notin_(extensions))
             elif extensions:
                 statement = statement.where(Entry.suffix.in_(extensions))

tagstudio/src/core/settings/__init__.py

@@ -1,3 +1,4 @@
 from .tssettings import TSSettings
+from .libsettings import LibSettings
 
-__all__ = ["TSSettings"]
+__all__ = ["TSSettings", "LibSettings"]

tagstudio/src/core/settings/libsettings.py

@@ -1,6 +1,40 @@
-from pydantic import BaseModel
+from pathlib import Path
+from pydantic import BaseModel, Field
+import toml
+import structlog
 
+logger = structlog.get_logger(__name__)
 
 class LibSettings(BaseModel):
-    # Cant think of any library-specific properties lol
-    test_prop: bool = False
+    is_exclude_list: bool = Field(default=True)
+    extension_list: list[str] = Field(default = [".json", ".xmp", ".aae"])
+    page_size: int = Field(default=500)
+    db_version: int = Field(default=2)
+    filename: str = Field(default="")
+
+    @staticmethod
+    def open(path_value: Path | str) -> "LibSettings":
+        path: Path
+        if not isinstance(path_value, Path):
+            path = Path(path_value)
+        else:
+            path = path_value
+
+        if path.exists():
+            with open(path, "r") as settings_file:
+                filecontents = settings_file.read()
+                if len(filecontents.strip()) != 0:
+                    settings_data = toml.loads(filecontents)
+                    settings_data["filename"] = str(path)
+                    return LibSettings(**settings_data)
+        
+        #either settings file did not exist or was empty - either way, use default settings
+        settings = LibSettings(**dict(filename=str(path)))
+        return settings
+    
+    def save(self):
+        if not (parent_path := Path(self.filename).parent).exists():
+            parent_path.mkdir()
+
+        with open(self.filename, "w") as settings_file:
+            toml.dump(dict(self), settings_file)

tagstudio/src/core/settings/tssettings.py

@@ -21,35 +21,27 @@ class TSSettings(BaseModel):
     filename: str = Field()
 
     @staticmethod
-    def read_settings(path: Path | str, **kwargs) -> "TSSettings":
+    def read_settings(path: Path | str) -> "TSSettings":
         path_value = Path(path)
-        settings_data: dict[str, Any] = dict()
         if path_value.exists():
-            with open(path, "rb") as file:
+            with open(path, "r") as file:
                 filecontents = file.read()
                 if len(filecontents.strip()) != 0:
-                    settings_data = toml.loads(filecontents.decode("utf-8"))
+                    settings_data = toml.loads(filecontents)
+                    settings = TSSettings(**settings_data)
+                    return settings
 
-        settings_data["filename"] = str(path)
-        settings = TSSettings(**settings_data)
-        return settings
-
-    def to_dict(self) -> dict[str, Any]:
-        d = dict[str, Any]()
-        for prop_name, prop_value in self:
-            d[prop_name] = prop_value
-
-        return d
+        return TSSettings(**dict(filename=str(path)))
 
     def save(self, path: Path | str | None = None) -> None:
         path_value: Path
         if isinstance(path, str):
             path_value = Path(path)
-
-        if path is None:
+        else:
             path_value = Path(self.filename)
+
         if not path_value.parent.exists():
             path_value.parent.mkdir(parents=True, exist_ok=True)
 
         with open(path_value, "w") as f:
-            toml.dump(self.to_dict(), f)
+            toml.dump(dict(self), f)

tagstudio/src/core/tscacheddata.py

@@ -21,26 +21,27 @@ class TSCachedData(BaseModel):
     path: str = Field()
 
     @staticmethod
-    def open(path: str | None = None) -> "TSCachedData":
-        file: str | None = None
-        if path is None:
-            if not Path(cache_dir).exists():
-                logger.info("Cache directory does not exist - creating", path=cache_dir)
-                Path.mkdir(cache_dir)
-            if not Path(cache_location).exists():
-                logger.info("Cache file does not exist - creating", path=cache_location)
-                open(cache_location, "w").close()
-            file = str(cache_location)
+    def open(path_value: Path | str | None = None) -> "TSCachedData":
+        path: Path | None = None
+        default_cache_location = Path(user_cache_dir()) / "ts_cache.toml"
+        if isinstance(path_value, str):
+            path = Path(path_value)
+        elif isinstance(path_value, Path):
+            path = path_value
         else:
-            if not Path(path).exists():
-                logger.info("Cache file does not exist - creating", path=path)
-                open(path, "w").close()
-            file = str(path)
-
-        data = toml.load(file)
-        data["path"] = str(path) if path is not None else str(cache_location)
-        cached_data = TSCachedData(**data)
-        return cached_data
+            logger.info("no cache location was specified, using ", default_cache_location=default_cache_location)
+            path = default_cache_location
+        
+        if path.exists():
+            with open(path, "r") as cache_file:
+                filecontents = cache_file.read()
+                if len(filecontents.strip()) != 0:
+                    cache_data = toml.loads(filecontents)
+                    cache_data["path"] = str(path)
+                    logger.info("opening cache file at ", cache_location=path)
+                    return TSCachedData(**cache_data)
+        
+        return TSCachedData(**dict(path=str(default_cache_location)))
 
     def save(self):
         with open(self.path, "w") as f:

tagstudio/src/qt/modals/file_extension.py

@@ -43,7 +43,7 @@ def __init__(self, library: "Library"):
         self.root_layout.setContentsMargins(6, 6, 6, 6)
 
         # Create Table Widget --------------------------------------------------
-        self.table = QTableWidget(len(self.lib.prefs(LibraryPrefs.EXTENSION_LIST)), 1)
+        self.table = QTableWidget(len(self.lib.settings.extension_list), 1)
         self.table.horizontalHeader().setVisible(False)
         self.table.verticalHeader().setVisible(False)
         self.table.horizontalHeader().setStretchLastSection(True)
@@ -74,7 +74,7 @@ def __init__(self, library: "Library"):
             lambda text: self.mode_combobox.setItemText(1, text), "ignore_list.mode.exclude"
         )
 
-        is_exclude_list = int(bool(self.lib.prefs(LibraryPrefs.IS_EXCLUDE_LIST)))
+        is_exclude_list = int(bool(self.lib.settings.is_exclude_list))
 
         self.mode_combobox.setCurrentIndex(is_exclude_list)
         self.mode_combobox.currentIndexChanged.connect(lambda i: self.update_list_mode(i))
@@ -97,10 +97,10 @@ def update_list_mode(self, mode: int):
             mode (int): The list mode, given by the index of the mode inside
                 the mode combobox. 1 for "Exclude", 0 for "Include".
         """
-        self.lib.set_prefs(LibraryPrefs.IS_EXCLUDE_LIST, bool(mode))
+        self.lib.settings.is_exclude_list = bool(mode)
 
     def refresh_list(self):
-        for i, ext in enumerate(self.lib.prefs(LibraryPrefs.EXTENSION_LIST)):
+        for i, ext in enumerate(self.lib.settings.extension_list):
             self.table.setItem(i, 0, QTableWidgetItem(ext))
 
     def add_item(self):
@@ -114,4 +114,4 @@ def save(self):
                 extensions.append(ext.text().strip().lstrip(".").lower())
 
         # save preference
-        self.lib.set_prefs(LibraryPrefs.EXTENSION_LIST, extensions)
+        self.lib.settings.extension_list = extensions

tagstudio/src/qt/modals/settings_modal.py

@@ -55,8 +55,7 @@ def __init__(self, settings: TSSettings):
         self.show_filenames_Row = QHBoxLayout()
         self.show_filenames_Row.addWidget(self.show_filenames_Label)
         self.show_filenames_Row.addWidget(self.show_filenames_Value)
-        # TODO: use value from translations
-        self.show_filenames_Label.setText("Show filenames in grid")
+        self.show_filenames_Label.setText("Show filenames in grid (requires restart)")
         self.show_filenames_Value.setChecked(self.tempSettings.show_filenames_in_grid)
 
         self.show_filenames_Value.stateChanged.connect(

tagstudio/src/qt/ts_qt.py

@@ -272,8 +272,6 @@ def start(self) -> None:
         Translations.translate_qobject(file_menu, "menu.file")
         edit_menu = QMenu(menu_bar)
         Translations.translate_qobject(edit_menu, "generic.edit_alt")
-        view_menu = QMenu(menu_bar)
-        Translations.translate_qobject(view_menu, "menu.view")
         tools_menu = QMenu(menu_bar)
         Translations.translate_qobject(tools_menu, "menu.tools")
         macros_menu = QMenu(menu_bar)
@@ -346,9 +344,7 @@ def start(self) -> None:
         # Edit Menu ============================================================
         settings_menu_action = QAction("&Settings", menu_bar)
         settings_menu_action.triggered.connect(lambda: self.open_settings_menu())
-        edit_menu.addAction(settings_menu_action)
-
-        edit_menu.addSeparator()
+        file_menu.addAction(settings_menu_action)
 
         new_tag_action = QAction(menu_bar)
         Translations.translate_qobject(new_tag_action, "menu.edit.new_tag")
@@ -476,7 +472,6 @@ def create_folders_tags_modal():
 
         menu_bar.addMenu(file_menu)
         menu_bar.addMenu(edit_menu)
-        menu_bar.addMenu(view_menu)
         menu_bar.addMenu(tools_menu)
         menu_bar.addMenu(macros_menu)
         menu_bar.addMenu(help_menu)
@@ -629,6 +624,7 @@ def close_library(self, is_shutdown: bool = False):
 
         self.cache.last_library = str(self.lib.library_dir)
         self.settings.save()
+        self.lib.settings.save()
 
         self.lib.close()
 
@@ -1289,7 +1285,7 @@ def init_library(self, path: Path, open_status: LibraryStatus):
 
         self.init_workers()
 
-        self.filter.page_size = self.lib.prefs(LibraryPrefs.PAGE_SIZE)
+        self.filter.page_size = self.lib.settings.page_size
 
         # TODO - make this call optional
         if self.lib.entries_count < 10000:

tagstudio/src/qt/widgets/migration_modal.py

@@ -417,12 +417,12 @@ def update_sql_value_ui(self, show_msg_box: bool = True):
         )
         self.update_sql_value(
             self.ext_row,
-            len(self.sql_lib.prefs(LibraryPrefs.EXTENSION_LIST)),
+            len(self.sql_lib.settings.extension_list),
             self.old_ext_count,
         )
         self.update_sql_value(
             self.ext_type_row,
-            self.sql_lib.prefs(LibraryPrefs.IS_EXCLUDE_LIST),
+            self.sql_lib.settings.is_exclude_list,
             self.old_ext_type,
         )
         logger.info("Parity check complete!")
@@ -680,7 +680,7 @@ def check_subtag_parity(self) -> bool:
         return self.subtag_parity
 
     def check_ext_type(self) -> bool:
-        return self.json_lib.is_exclude_list == self.sql_lib.prefs(LibraryPrefs.IS_EXCLUDE_LIST)
+        return self.json_lib.is_exclude_list == self.sql_lib.settings.is_exclude_list
 
     def check_alias_parity(self) -> bool:
         """Check if all JSON aliases match the new SQL aliases."""