add_field_tag

Author: yedpodtrzitko

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

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING, Union, Type, TypeVar, Any
 
 from sqlalchemy import ForeignKey
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship, Session
 
 from .db import Base
 
@@ -110,7 +110,12 @@ def __init__(
         super().__init__()
 
     def __key(self):
-        return (self.type, self.name, str(self.tag_ids))
+        # tags are not bound to session, dont show them
+        return (
+            self.id,
+            self.type,
+            self.name,
+        )  # str(self.tag_ids))
 
     def __hash__(self):
         return hash(self.__key())

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

@@ -170,7 +170,7 @@ def verify_ts_folders(self, library_dir: Path) -> None:
 
     def verify_default_tags(self, tag_list: list) -> list:
         """
-        Ensures that the default builtin tags  are present in the Library's
+        Ensure that the default builtin tags  are present in the Library's
         save file. Takes in and returns the tag dictionary from the JSON file.
         """
         missing: list = []
@@ -181,7 +181,7 @@ def verify_default_tags(self, tag_list: list) -> list:
         return tag_list
 
     def clear_internal_vars(self):
-        """Clears the internal variables of the Library object."""
+        """Clear the internal variables of the Library object."""
         self.library_dir = None
         self.missing_files = []
         self.dupe_files = []
@@ -201,13 +201,11 @@ def refresh_dir(self) -> Iterator[int]:
 
         for path in self.library_dir.glob("**/*"):
             str_path = str(path)
-            if any(
-                [
-                    path.is_dir()
-                    or "$RECYCLE.BIN" in str_path
-                    or TS_FOLDER_NAME in str_path
-                    or "tagstudio_thumbs" in str_path
-                ]
+            if (
+                path.is_dir()
+                or "$RECYCLE.BIN" in str_path
+                or TS_FOLDER_NAME in str_path
+                or "tagstudio_thumbs" in str_path
             ):
                 continue
 
@@ -527,22 +525,15 @@ def add_tag(self, tag: Tag) -> bool:
             else:
                 return True
 
-    def add_tag_to_field(
+    def add_field_tag(
         self,
-        tag: int | Tag,
+        tag: Tag,
         field: TagBoxField,
     ) -> None:
-        if isinstance(tag, Tag):
-            tag = tag.id
-
         with Session(self.engine) as session, session.begin():
-            tag_object = session.scalars(select(Tag).where(Tag.id == tag)).one()
-
-            field_ = session.scalars(
-                select(TagBoxField).where(TagBoxField.id == field.id)
-            ).one()
-
-            field_.tags.add(tag_object)
+            field.tags = field.tags | {tag}
+            session.add(field)
+            session.commit()
 
     def add_tag_to_entry_meta_tags(self, tag: int | Tag, entry_id: int) -> None:
         if isinstance(tag, Tag):

tagstudio/src/qt/widgets/preview_panel.py

@@ -692,12 +692,18 @@ def update_widgets(self):
             )
 
             self.selected = list(self.driver.selected)
+            logger.info(
+                "update_widgets enum common_fields", common_fields=self.common_fields
+            )
             for i, f in enumerate(self.common_fields):
-                logger.info("update_widgets enum common_fields", index=i, field=f)
                 self.write_container(i, f)
 
+            logger.info(
+                "update_widgets enum mixed_fields",
+                self.mixed_fields,
+                start=len(self.common_fields),
+            )
             for i, f in enumerate(self.mixed_fields, start=len(self.common_fields)):
-                logger.info("update_widgets enum mixed_fields", index=i, field=f)
                 self.write_container(i, f, mixed=True)
 
             # Hide leftover containers
@@ -724,7 +730,9 @@ def set_tags_updated_slot(self, slot: object):
         self.tags_updated.connect(slot)
         self.is_connected = True
 
-    def write_container(self, index: int, field, mixed: bool = False):
+    def write_container(
+        self, index: int, field: TagBoxField | TextField, mixed: bool = False
+    ):
         """Update/Create data for a FieldContainer."""
         # Remove 'Add Field' button from scroll_layout, to be re-added later.
         self.scroll_layout.takeAt(self.scroll_layout.count() - 1).widget()
@@ -741,13 +749,14 @@ def write_container(self, index: int, field, mixed: bool = False):
             container.set_title(field.name)
             container.set_inline(False)
             title = f"{field.name} (Tag Box)"
+
             if not mixed:
                 entry = self.driver.frame_content[self.selected[0]]
                 inner_container = container.get_inner_widget()
                 if isinstance(inner_container, TagBoxWidget):
                     # TODO
                     # inner_container.set_item(entry)
-                    # inner_container.set_tags(field.tags)  # type: ignore
+                    inner_container.set_tags(list(field.tags))
 
                     try:
                         inner_container.updated.disconnect()
@@ -756,6 +765,10 @@ def write_container(self, index: int, field, mixed: bool = False):
                         pass
 
                 else:
+                    logger.info(
+                        "inner_container is not instance of TagBoxWidget",
+                        container=inner_container,
+                    )
                     inner_container = TagBoxWidget(
                         entry,
                         title,

tagstudio/src/qt/widgets/tag_box.py

@@ -41,7 +41,7 @@ def __init__(
     ) -> None:
         super().__init__(title)
 
-        self.item = item
+        # self.item = item
         self.driver = driver  # Used for creating tag click callbacks that search entries for that tag.
         # self.field_index = field_index
         self.tags = tags
@@ -86,21 +86,16 @@ def __init__(
 
         self.set_tags(tags)
 
-    def set_item(self, item):
-        self.item = item
-
     def set_tags(self, tags: list[Tag]):
         is_recycled = False
-        if self.base_layout.itemAt(0):
-            while self.base_layout.itemAt(0) and self.base_layout.itemAt(1):
-                self.base_layout.takeAt(0).widget().deleteLater()
+        while self.base_layout.itemAt(0) and self.base_layout.itemAt(1):
+            self.base_layout.takeAt(0).widget().deleteLater()
             is_recycled = True
 
         for tag in tags:
             tw = TagWidget(tag, True, True)
             tw.on_click.connect(
                 lambda tag_id=tag.id: (
-                    print("tag widget clicked on_click emited", tag_id),
                     self.driver.main_window.searchField.setText(f"tag_id:{tag_id}"),  # type: ignore
                     self.driver.filter_items(FilterState(id=tag_id)),  # type: ignore[func-returns-value]
                 )
@@ -109,6 +104,7 @@ def set_tags(self, tags: list[Tag]):
             tw.on_remove.connect(lambda tag_id=tag.id: self.remove_tag(tag_id))
             tw.on_edit.connect(lambda tag_id=tag.id: self.edit_tag(tag_id))
             self.base_layout.addWidget(tw)
+
         self.tags = tags
 
         # Move or add the '+' button.
@@ -128,7 +124,7 @@ def edit_tag(self, tag_id: int):
         tag = self.driver.lib.get_tag(tag_id)
         self.edit_modal = PanelModal(
             btp,
-            tag.name,
+            tag.name,  # TODO - display name including subtags
             "Edit Tag",
             done_callback=self.driver.preview_panel.update_widgets,
             has_save=True,
@@ -142,17 +138,17 @@ def edit_tag(self, tag_id: int):
     def add_tag_callback(self, tag_id: int):
         logger.info("add_tag_callback", tag_id=tag_id, selected=self.driver.selected)
 
+        tag = self.driver.lib.get_tag(tag_id=tag_id)
+
         for idx in self.driver.selected:
             entry: Entry = self.driver.frame_content[idx]
 
             # TODO - add tag to correct field
             tag_field: TagBoxField = entry.tag_box_fields[0]
+            self.driver.lib.add_field_tag(tag, tag_field)
 
-            tag = self.driver.lib.get_tag(tag_id=tag_id)
-
-            tag_field.tags.add(tag)
-
-            self.updated.emit()
+        # TODO - this was originally in the loop, is it needed there?
+        self.updated.emit()
 
         if tag_id in (TAG_FAVORITE, TAG_ARCHIVED):
             self.driver.update_badges()

tagstudio/tests/alchemy/test_library.py

@@ -1,6 +1,5 @@
 import random
 import string
-from copy import copy
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -25,7 +24,7 @@ def generate_entry(*, path: Path = None) -> Entry:
 
 
 @pytest.fixture
-def tag_fixture():
+def generate_tag():
     def inner(**kwargs):
         params = dict(name="foo", color=TagColor.red) | kwargs
         return Tag(**params)
@@ -59,12 +58,12 @@ def test_library_add_file():
         assert lib.has_item(entry.path)
 
 
-def test_create_tag(library, tag_fixture):
+def test_create_tag(library, generate_tag):
     # tag already exists
-    assert not library.add_tag(tag_fixture())
+    assert not library.add_tag(generate_tag())
 
     # new tag name
-    assert library.add_tag(tag_fixture(name="bar"))
+    assert library.add_tag(generate_tag(name="bar"))
 
 
 def test_library_search(library, tag_fixture):
@@ -153,3 +152,19 @@ def test_add_field_to_entry(library):
     entry = [x for x in library.entries if x.path == item_path][0]
     # meta tags and tags field present
     assert len(entry.tag_box_fields) == 2
+
+
+def test_add_field_tag(library, generate_tag):
+    # Given
+    entry = library.entries[0]
+    tag_name = "xxx"
+    tag = generate_tag(name=tag_name)
+    tag_field = entry.tag_box_fields[0]
+
+    # When
+    library.add_field_tag(tag, tag_field)
+
+    # Then
+    entry = [x for x in library.entries if x.id == entry.id][0]
+    tag_field = entry.tag_box_fields[0]
+    assert [x.name for x in tag_field.tags if x.name == tag_name]