Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-14 20:33:16 +01:00
Code Issues Projects Releases Wiki Activity

honor dlna sort order to content exceeding the first page (#3747)

Browse source
This commit is contained in:
CJ 2023-05-23 00:07:06 -05:00 committed by GitHub
parent 124adb3f5b
commit 58a6c22072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/dlna/cds.go
View file

@ -440,15 +440,21 @@ func getRootObjects() []interface{} {
return objs return objs
} }
func getSortDirection(sceneFilter *models.SceneFilterType, sort string) models.SortDirectionEnum {
direction := models.SortDirectionEnumDesc
if sort == "title" {
direction = models.SortDirectionEnumAsc
}
return direction
}
func (me *contentDirectoryService) getVideos(sceneFilter *models.SceneFilterType, parentID string, host string) []interface{} { func (me *contentDirectoryService) getVideos(sceneFilter *models.SceneFilterType, parentID string, host string) []interface{} {
var objs []interface{} var objs []interface{}
if err := txn.WithReadTxn(context.TODO(), me.txnManager, func(ctx context.Context) error { if err := txn.WithReadTxn(context.TODO(), me.txnManager, func(ctx context.Context) error {
sort := me.VideoSortOrder sort := me.VideoSortOrder
direction := models.SortDirectionEnumDesc direction := getSortDirection(sceneFilter, sort)
if sort == "title" {
direction = models.SortDirectionEnumAsc
}
findFilter := &models.FindFilterType{ findFilter := &models.FindFilterType{
PerPage: &pageSize, PerPage: &pageSize,
Sort: &sort, Sort: &sort,
@ -497,8 +503,10 @@ func (me *contentDirectoryService) getPageVideos(sceneFilter *models.SceneFilter
parentID: parentID, parentID: parentID,
} }
sort := me.VideoSortOrder
direction := getSortDirection(sceneFilter, sort)
var err error var err error
objs, err = pager.getPageVideos(ctx, me.repository.SceneFinder, me.repository.FileFinder, page, host) objs, err = pager.getPageVideos(ctx, me.repository.SceneFinder, me.repository.FileFinder, page, host, sort, direction)
if err != nil { if err != nil {
return err return err
} }

4
internal/dlna/paging.go
View file

@ -60,14 +60,14 @@ func (p *scenePager) getPages(ctx context.Context, r scene.Queryer, total int) (
return objs, nil return objs, nil
} }
func (p *scenePager) getPageVideos(ctx context.Context, r SceneFinder, f file.Finder, page int, host string) ([]interface{}, error) { func (p *scenePager) getPageVideos(ctx context.Context, r SceneFinder, f file.Finder, page int, host string, sort string, direction models.SortDirectionEnum) ([]interface{}, error) {
var objs []interface{} var objs []interface{}
sort := "title"
findFilter := &models.FindFilterType{ findFilter := &models.FindFilterType{
PerPage: &pageSize, PerPage: &pageSize,
Page: &page, Page: &page,
Sort: &sort, Sort: &sort,
Direction: &direction,
} }
scenes, err := scene.Query(ctx, r, p.sceneFilter, findFilter) scenes, err := scene.Query(ctx, r, p.sceneFilter, findFilter)