fix: don't allow blank tag alias values in db (#628)

TagStudioDev · Dec 9, 2024 · aaea0b1 · aaea0b1
1 parent a535ed1
commit aaea0b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/tagstudio/src/core/library/alchemy/library.py b/tagstudio/src/core/library/alchemy/library.py
@@ -169,6 +169,8 @@ def migrate_json_to_sqlite(self, json_lib: JsonLibrary):
         # Tag Aliases
         for tag in json_lib.tags:
             for alias in tag.aliases:
+                if not alias:
+                    break
                 self.add_alias(name=alias, tag_id=tag.id)
 
         # Tag Subtags
@@ -1015,6 +1017,9 @@ def add_subtag(self, parent_id: int, child_id: int) -> bool:
 
     def add_alias(self, name: str, tag_id: int) -> bool:
         with Session(self.engine) as session:
+            if not name:
+                logger.warning("[LIBRARY][add_alias] Alias value must not be empty")
+                return False
             alias = TagAlias(
                 name=name,
                 tag_id=tag_id,

diff --git a/tagstudio/src/core/library/alchemy/models.py b/tagstudio/src/core/library/alchemy/models.py
@@ -23,7 +23,7 @@ class TagAlias(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
 
-    name: Mapped[str]
+    name: Mapped[str] = mapped_column(nullable=False)
 
     tag_id: Mapped[int] = mapped_column(ForeignKey("tags.id"))
     tag: Mapped["Tag"] = relationship(back_populates="aliases")

diff --git a/tagstudio/src/qt/widgets/migration_modal.py b/tagstudio/src/qt/widgets/migration_modal.py
@@ -699,7 +699,7 @@ def check_alias_parity(self) -> bool:
                 sql_aliases = set(
                     session.scalars(select(TagAlias.name).where(TagAlias.tag_id == tag.id))
                 )
-                json_aliases = set(self.json_lib.get_tag(tag_id).aliases)
+                json_aliases = set([x for x in self.json_lib.get_tag(tag_id).aliases if x])
 
                 logger.info(
                     "[Alias Parity]",