calvin.erfmann/TagStudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2026-01-30 06:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(library): get_tag_by_name (#1006)

Browse Source
This commit is contained in:
Jann Stute
2025-08-03 22:03:36 +02:00
committed by GitHub
parent 9b287cb5af
commit 940617cd63
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tagstudio/core/library/alchemy/library.py
View File

@@ -858,7 +858,7 @@ class Library:
def search_library(
self,
search: BrowsingState,
page_size: int,
page_size: int | None,
) -> SearchResult:
"""Filter library by search query.
@@ -903,7 +903,8 @@ class Library:
sort_on = func.lower(Entry.path)
statement = statement.order_by(asc(sort_on) if search.ascending else desc(sort_on))
statement = statement.limit(page_size).offset(search.page_index * page_size)
if page_size is not None:
statement = statement.limit(page_size).offset(search.page_index * page_size)
logger.info(
"searching library",
@@ -1425,12 +1426,14 @@ class Library:
)
tag = session.scalar(tags_query.where(Tag.id == tag_id))
session.expunge(tag)
for parent in tag.parent_tags:
session.expunge(parent)
if tag is not None:
session.expunge(tag)
for alias in tag.aliases:
session.expunge(alias)
for parent in tag.parent_tags:
session.expunge(parent)
for alias in tag.aliases:
session.expunge(alias)
return tag
@@ -1438,10 +1441,23 @@ class Library:
with Session(self.engine) as session:
statement = (
select(Tag)
.options(selectinload(Tag.parent_tags), selectinload(Tag.aliases))
.outerjoin(TagAlias)
.where(or_(Tag.name == tag_name, TagAlias.name == tag_name))
)
return session.scalar(statement)
tag = session.scalar(statement)
if tag is not None:
session.expunge(tag)
for parent in tag.parent_tags:
session.expunge(parent)
for alias in tag.aliases:
session.expunge(alias)
return tag
def get_alias(self, tag_id: int, alias_id: int) -> TagAlias | None:
with Session(self.engine) as session: