Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include primary tag in tag marker count sorting (#2993)

This commit is contained in:
WithoutPants 2022-10-11 14:21:28 +11:00 committed by GitHub
parent 9bff498c28
commit 68a1547e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sqlite/tag.go
View File

@ -600,7 +600,7 @@ func (qb *tagQueryBuilder) getTagSort(query *queryBuilder, findFilter *models.Fi
case "scenes_count":
return getCountSort(tagTable, scenesTagsTable, tagIDColumn, direction)
case "scene_markers_count":
return getCountSort(tagTable, "scene_markers_tags", tagIDColumn, direction)
return fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM scene_markers_tags WHERE tags.id = scene_markers_tags.tag_id)+(SELECT COUNT(*) FROM scene_markers WHERE tags.id = scene_markers.primary_tag_id) %s", getSortDirection(direction))
case "images_count":
return getCountSort(tagTable, imagesTagsTable, tagIDColumn, direction)
case "galleries_count":

2
pkg/sqlite/tag_test.go
View File

@ -191,7 +191,7 @@ func TestTagQuerySort(t *testing.T) {
sortBy = "scene_markers_count"
tags = queryTags(ctx, t, sqb, nil, findFilter)
assert.Equal(tagIDs[tagIdxWithMarkers], tags[0].ID)
assert.Equal(tagIDs[tagIdxWithPrimaryMarkers], tags[0].ID)
sortBy = "images_count"
tags = queryTags(ctx, t, sqb, nil, findFilter)