refactor: code cleanup and fixes

tests/qt/test_field_containers.py

@@ -2,15 +2,14 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry, Tag
 from tagstudio.core.utils.types import unwrap
 from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
 from tagstudio.qt.ts_qt import QtDriver
 
 
-def test_update_selection_empty(qt_driver: QtDriver, library: Library):
-    panel = PreviewPanel(library, qt_driver)
+def test_update_selection_empty(qt_driver: QtDriver):
+    panel = PreviewPanel(qt_driver)
 
     # Clear the library selection (selecting 1 then unselecting 1)
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -22,8 +21,8 @@ def test_update_selection_empty(qt_driver: QtDriver, library: Library):
         assert container.isHidden()
 
 
-def test_update_selection_single(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -34,10 +33,10 @@ def test_update_selection_single(qt_driver: QtDriver, library: Library, entry_fu
         assert not container.isHidden()
 
 
-def test_update_selection_multiple(qt_driver: QtDriver, library: Library):
+def test_update_selection_multiple(qt_driver: QtDriver):
     # TODO: Implement mixed field editing. Currently these containers will be hidden,
     # same as the empty selection behavior.
-    panel = PreviewPanel(library, qt_driver)
+    panel = PreviewPanel(qt_driver)
 
     # Select the multiple entries
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -49,8 +48,8 @@ def test_update_selection_multiple(qt_driver: QtDriver, library: Library):
         assert container.isHidden()
 
 
-def test_add_tag_to_selection_single(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_add_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     assert {t.id for t in entry_full.tags} == {1000}
 
@@ -62,12 +61,12 @@ def test_add_tag_to_selection_single(qt_driver: QtDriver, library: Library, entr
     panel.field_containers_widget.add_tags_to_selected(2000)
 
     # Then reload entry
-    refreshed_entry: Entry = next(library.all_entries(with_joins=True))
+    refreshed_entry: Entry = next(qt_driver.lib.all_entries(with_joins=True))
     assert {t.id for t in refreshed_entry.tags} == {1000, 2000}
 
 
-def test_add_same_tag_to_selection_single(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_add_same_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     assert {t.id for t in entry_full.tags} == {1000}
 
@@ -79,13 +78,13 @@ def test_add_same_tag_to_selection_single(qt_driver: QtDriver, library: Library,
     panel.field_containers_widget.add_tags_to_selected(1000)
 
     # Then reload entry
-    refreshed_entry = next(library.all_entries(with_joins=True))
+    refreshed_entry = next(qt_driver.lib.all_entries(with_joins=True))
     assert {t.id for t in refreshed_entry.tags} == {1000}
 
 
-def test_add_tag_to_selection_multiple(qt_driver: QtDriver, library: Library):
-    panel = PreviewPanel(library, qt_driver)
-    all_entries = library.all_entries(with_joins=True)
+def test_add_tag_to_selection_multiple(qt_driver: QtDriver):
+    panel = PreviewPanel(qt_driver)
+    all_entries = qt_driver.lib.all_entries(with_joins=True)
 
     # We want to verify that tag 1000 is on some, but not all entries already.
     tag_present_on_some: bool = False
@@ -101,7 +100,7 @@ def test_add_tag_to_selection_multiple(qt_driver: QtDriver, library: Library):
     assert tag_absent_on_some
 
     # Select the multiple entries
-    for i, e in enumerate(library.all_entries(with_joins=True), start=0):
+    for i, e in enumerate(qt_driver.lib.all_entries(with_joins=True), start=0):
         qt_driver.toggle_item_selection(e.id, append=(True if i == 0 else False), bridge=False)  # noqa: SIM210
     panel.set_selection(qt_driver.selected)
 
@@ -109,7 +108,7 @@ def test_add_tag_to_selection_multiple(qt_driver: QtDriver, library: Library):
     panel.field_containers_widget.add_tags_to_selected(1000)
 
     # Then reload all entries and recheck the presence of tag 1000
-    refreshed_entries = library.all_entries(with_joins=True)
+    refreshed_entries = qt_driver.lib.all_entries(with_joins=True)
     tag_present_on_some = False
     tag_absent_on_some = False
 
@@ -123,11 +122,11 @@ def test_add_tag_to_selection_multiple(qt_driver: QtDriver, library: Library):
     assert not tag_absent_on_some
 
 
-def test_meta_tag_category(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_meta_tag_category(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     # Ensure the Favorite tag is on entry_full
-    library.add_tags_to_entries(1, entry_full.id)
+    qt_driver.lib.add_tags_to_entries(1, entry_full.id)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -139,7 +138,7 @@ def test_meta_tag_category(qt_driver: QtDriver, library: Library, entry_full: En
         match i:
             case 0:
                 # Check if the container is the Meta Tags category
-                tag: Tag = unwrap(library.get_tag(2))
+                tag: Tag = unwrap(qt_driver.lib.get_tag(2))
                 assert container.title == f"<h4>{tag.name}</h4>"
             case 1:
                 # Check if the container is the Tags category
@@ -151,18 +150,16 @@ def test_meta_tag_category(qt_driver: QtDriver, library: Library, entry_full: En
                 pass
 
 
-def test_custom_tag_category(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_custom_tag_category(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     # Set tag 1000 (foo) as a category
-    tag: Tag = unwrap(library.get_tag(1000))
+    tag: Tag = unwrap(qt_driver.lib.get_tag(1000))
     tag.is_category = True
-    library.update_tag(
-        tag,
-    )
+    qt_driver.lib.update_tag(tag)
 
     # Ensure the Favorite tag is on entry_full
-    library.add_tags_to_entries(1, entry_full.id)
+    qt_driver.lib.add_tags_to_entries(1, entry_full.id)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -174,7 +171,7 @@ def test_custom_tag_category(qt_driver: QtDriver, library: Library, entry_full:
         match i:
             case 0:
                 # Check if the container is the Meta Tags category
-                tag_2: Tag = unwrap(library.get_tag(2))
+                tag_2: Tag = unwrap(qt_driver.lib.get_tag(2))
                 assert container.title == f"<h4>{tag_2.name}</h4>"
             case 1:
                 # Check if the container is the custom "foo" category

tests/qt/test_file_path_options.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
+# pyright: reportPrivateUsage=false, reportAttributeAccessIssue=false
 
 import os
 from collections.abc import Callable
@@ -8,9 +9,7 @@ from pathlib import Path
 from unittest.mock import patch
 
 import pytest
-from PySide6.QtGui import (
-    QAction,
-)
+from PySide6.QtGui import QAction
 from PySide6.QtWidgets import QMenu, QMenuBar
 from pytestqt.qtbot import QtBot
 
@@ -60,11 +59,10 @@ def test_filepath_setting(qtbot: QtBot, qt_driver: QtDriver, filepath_option: Sh
 )
 def test_file_path_display(
     qt_driver: QtDriver,
-    library: Library,
     filepath_option: ShowFilepathOption,
     expected_path: Callable[[Library], Path],
 ):
-    panel = PreviewPanel(library, qt_driver)
+    panel = PreviewPanel(qt_driver)
 
     # Select 2
     qt_driver.toggle_item_selection(2, append=False, bridge=False)
@@ -73,15 +71,17 @@ def test_file_path_display(
     qt_driver.settings.show_filepath = filepath_option
 
     # Apply the mock value
-    entry = library.get_entry(2)
+    entry = qt_driver.lib.get_entry(2)
     assert isinstance(entry, Entry)
     filename = entry.path
-    panel._file_attributes_widget.update_stats(filepath=unwrap(library.library_dir) / filename)  # pyright: ignore[reportPrivateUsage]
+    panel._file_attributes_widget.update_stats(
+        filepath=unwrap(qt_driver.lib.library_dir) / filename
+    )
 
     # Generate the expected file string.
     # This is copied directly from the file_attributes.py file
     # can be imported as a function in the future
-    display_path: Path = expected_path(library)
+    display_path: Path = expected_path(qt_driver.lib)
     file_str: str = ""
     separator: str = f"<a style='color: #777777'><b>{os.path.sep}</a>"  # Gray
     for i, part in enumerate(display_path.parts):
@@ -94,7 +94,7 @@ def test_file_path_display(
             file_str += f"<b>{'\u200b'.join(part_)}</b>"
 
     # Assert the file path is displayed correctly
-    assert panel._file_attributes_widget.file_label.text() == file_str  # pyright: ignore[reportPrivateUsage]
+    assert panel._file_attributes_widget.file_label.text() == file_str
 
 
 @pytest.mark.parametrize(
@@ -146,7 +146,7 @@ def test_title_update(
     qt_driver.main_window.menu_bar.folders_to_tags_action = QAction(menu_bar)
 
     # Trigger the update
-    qt_driver._init_library(library_dir, open_status)  # pyright: ignore[reportPrivateUsage]
+    qt_driver._init_library(library_dir, open_status)
 
     # Assert the title is updated correctly
-    qt_driver.main_window.setWindowTitle.assert_called_with(expected_title(library_dir, base_title))  # pyright: ignore[reportAttributeAccessIssue]
+    qt_driver.main_window.setWindowTitle.assert_called_with(expected_title(library_dir, base_title))

tests/qt/test_preview_panel.py

@@ -2,14 +2,13 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry
 from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
 from tagstudio.qt.ts_qt import QtDriver
 
 
-def test_update_selection_empty(qt_driver: QtDriver, library: Library):
-    panel = PreviewPanel(library, qt_driver)
+def test_update_selection_empty(qt_driver: QtDriver):
+    panel = PreviewPanel(qt_driver)
 
     # Clear the library selection (selecting 1 then unselecting 1)
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -20,8 +19,8 @@ def test_update_selection_empty(qt_driver: QtDriver, library: Library):
     assert not panel.add_buttons_enabled
 
 
-def test_update_selection_single(qt_driver: QtDriver, library: Library, entry_full: Entry):
-    panel = PreviewPanel(library, qt_driver)
+def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
+    panel = PreviewPanel(qt_driver)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -31,8 +30,8 @@ def test_update_selection_single(qt_driver: QtDriver, library: Library, entry_fu
     assert panel.add_buttons_enabled
 
 
-def test_update_selection_multiple(qt_driver: QtDriver, library: Library):
-    panel = PreviewPanel(library, qt_driver)
+def test_update_selection_multiple(qt_driver: QtDriver):
+    panel = PreviewPanel(qt_driver)
 
     # Select the multiple entries
     qt_driver.toggle_item_selection(1, append=False, bridge=False)