Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-16 20:07:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Studio child filter and sort (#4479)

Browse Source
This commit is contained in:
dogwithakeyboard
2024-02-06 02:24:00 +00:00
committed by GitHub
parent a402ee5fa7
commit 9ac6505241
6 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/studio.go
View File

@@ -26,6 +26,8 @@ type StudioFilterType struct {
URL *StringCriterionInput `json:"url"`
// Filter by studio aliases
Aliases *StringCriterionInput `json:"aliases"`
// Filter by subsidiary studio count
ChildCount *IntCriterionInput `json:"child_count"`
// Filter by autotag ignore value
IgnoreAutoTag *bool `json:"ignore_auto_tag"`
// Filter by created at

2
pkg/sqlite/sql.go
View File

@@ -107,7 +107,7 @@ func getRandomSort(tableName string, direction string, seed uint64) string {
}
func getCountSort(primaryTable, joinTable, primaryFK, direction string) string {
return fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM %s WHERE %s = %s.id) %s", joinTable, primaryFK, primaryTable, getSortDirection(direction))
return fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM %s AS sort WHERE sort.%s = %s.id) %s", joinTable, primaryFK, primaryTable, getSortDirection(direction))
}
func getMultiSumSort(sum string, primaryTable, foreignTable1, joinTable1, foreignTable2, joinTable2, primaryFK, foreignFK1, foreignFK2, direction string) string {

14
pkg/sqlite/studio.go
View File

@@ -517,6 +517,7 @@ func (qb *StudioStore) makeFilter(ctx context.Context, studioFilter *models.Stud
query.handleCriterion(ctx, studioGalleryCountCriterionHandler(qb, studioFilter.GalleryCount))
query.handleCriterion(ctx, studioParentCriterionHandler(qb, studioFilter.Parents))
query.handleCriterion(ctx, studioAliasCriterionHandler(qb, studioFilter.Aliases))
query.handleCriterion(ctx, studioChildCountCriterionHandler(qb, studioFilter.ChildCount))
query.handleCriterion(ctx, timestampCriterionHandler(studioFilter.CreatedAt, studioTable+".created_at"))
query.handleCriterion(ctx, timestampCriterionHandler(studioFilter.UpdatedAt, studioTable+".updated_at"))
@@ -649,6 +650,17 @@ func studioAliasCriterionHandler(qb *StudioStore, alias *models.StringCriterionI
return h.handler(alias)
}
func studioChildCountCriterionHandler(qb *StudioStore, childCount *models.IntCriterionInput) criterionHandlerFunc {
return func(ctx context.Context, f *filterBuilder) {
if childCount != nil {
f.addLeftJoin("studios", "children_count", "children_count.parent_id = studios.id")
clause, args := getIntCriterionWhereClause("count(distinct children_count.id)", *childCount)
f.addHaving(clause, args...)
}
}
}
func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) string {
var sort string
var direction string
@@ -668,6 +680,8 @@ func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) string {
sortQuery += getCountSort(studioTable, imageTable, studioIDColumn, direction)
case "galleries_count":
sortQuery += getCountSort(studioTable, galleryTable, studioIDColumn, direction)
case "child_count":
sortQuery += getCountSort(studioTable, studioTable, studioParentIDColumn, direction)
default:
sortQuery += getSort(sort, direction, "studios")
}