perf: one less db call for Library.tag_display_name

Author: TheBobBobs

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

@@ -314,22 +314,21 @@ def get_field_name_from_id(self, field_id: int) -> _FieldID:
                 return f
         return None
 
-    def tag_display_name(self, tag_id: int) -> str:
-        with Session(self.engine) as session:
-            tag = session.scalar(select(Tag).where(Tag.id == tag_id))
-            if not tag:
-                return "<NO TAG>"
+    def tag_display_name(self, tag: Tag | None) -> str:
+        if not tag:
+            return "<NO TAG>"
 
-            if tag.disambiguation_id:
+        if tag.disambiguation_id:
+            with Session(self.engine) as session:
                 disam_tag = session.scalar(select(Tag).where(Tag.id == tag.disambiguation_id))
                 if not disam_tag:
                     return "<NO DISAM TAG>"
                 disam_name = disam_tag.shorthand
                 if not disam_name:
                     disam_name = disam_tag.name
                 return f"{tag.name} ({disam_name})"
-            else:
-                return tag.name
+        else:
+            return tag.name
 
     def open_library(self, library_dir: Path, storage_path: Path | None = None) -> LibraryStatus:
         is_new: bool = True

src/tagstudio/qt/modals/tag_database.py

@@ -63,7 +63,7 @@ def delete_tag(self, tag: Tag):
         message_box = QMessageBox(
             QMessageBox.Question,  # type: ignore
             Translations["tag.remove"],
-            Translations.format("tag.confirm_delete", tag_name=self.lib.tag_display_name(tag.id)),
+            Translations.format("tag.confirm_delete", tag_name=self.lib.tag_display_name(tag)),
             QMessageBox.Ok | QMessageBox.Cancel,  # type: ignore
         )
 

src/tagstudio/qt/modals/tag_search.py

@@ -364,7 +364,7 @@ def callback(btp: build_tag.BuildTagPanel):
 
         self.edit_modal = PanelModal(
             build_tag_panel,
-            self.lib.tag_display_name(tag.id),
+            self.lib.tag_display_name(tag),
             done_callback=(self.update_tags(self.search_field.text())),
             has_save=True,
         )

src/tagstudio/qt/widgets/tag.py

@@ -254,7 +254,7 @@ def set_tag(self, tag: Tag | None) -> None:
         )
 
         if self.lib:
-            self.bg_button.setText(escape_text(self.lib.tag_display_name(tag.id)))
+            self.bg_button.setText(escape_text(self.lib.tag_display_name(tag)))
         else:
             self.bg_button.setText(escape_text(tag.name))
 

src/tagstudio/qt/widgets/tag_box.py

@@ -47,7 +47,7 @@ def __init__(
         self.set_tags(self.tags)
 
     def set_tags(self, tags: typing.Iterable[Tag]):
-        tags_ = sorted(list(tags), key=lambda tag: self.driver.lib.tag_display_name(tag.id))
+        tags_ = sorted(list(tags), key=lambda tag: self.driver.lib.tag_display_name(tag))
         logger.info("[TagBoxWidget] Tags:", tags=tags)
         while self.base_layout.itemAt(0):
             self.base_layout.takeAt(0).widget().deleteLater()
@@ -81,7 +81,7 @@ def edit_tag(self, tag: Tag):
 
         self.edit_modal = PanelModal(
             build_tag_panel,
-            self.driver.lib.tag_display_name(tag.id),
+            self.driver.lib.tag_display_name(tag),
             "Edit Tag",
             done_callback=lambda: self.driver.preview_panel.update_widgets(update_preview=False),
             has_save=True,