Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tagstudio/src/core/library/alchemy/library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,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
Expand Down Expand Up @@ -1027,6 +1029,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,
Expand Down
2 changes: 1 addition & 1 deletion tagstudio/src/core/library/alchemy/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tagstudio/src/qt/widgets/migration_modal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
Expand Down
Loading