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

Correct title ordering for objects without titles (#3244)

Browse Source 
* Correct scene title ordering
* Correct ordering for other objects
* Add basename function, add to gallery title sort
This commit is contained in:
WithoutPants
2022-12-09 08:29:34 +11:00
committed by GitHub
parent 78bb2d8425
commit eb7956a05a
7 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/sqlite/database.go
View File

@@ -428,6 +428,7 @@ func registerCustomDriver() {
funcs := map[string]interface{}{
"regexp": regexFn,
"durationToTinyInt": durationToTinyIntFn,
"basename": basenameFn,
}
for name, fn := range funcs {

5
pkg/sqlite/functions.go
View File

@@ -1,6 +1,7 @@
package sqlite
import (
"path/filepath"
"strconv"
"strings"
)
@@ -30,3 +31,7 @@ func durationToTinyIntFn(str string) (int64, error) {
return int64(seconds), nil
}
func basenameFn(str string) (string, error) {
return filepath.Base(str), nil
}

2
pkg/sqlite/gallery.go
View File

@@ -1109,7 +1109,7 @@ func (qb *GalleryStore) setGallerySort(query *queryBuilder, findFilter *models.F
case "title":
addFileTable()
addFolderTable()
query.sortAndPagination += " ORDER BY galleries.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", file_folder.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
query.sortAndPagination += " ORDER BY COALESCE(galleries.title, files.basename, basename(COALESCE(folders.path, ''))) COLLATE NATURAL_CS " + direction + ", file_folder.path " + direction
default:
query.sortAndPagination += getSort(sort, direction, "galleries")
}

7
pkg/sqlite/gallery_test.go
View File

@@ -2414,6 +2414,13 @@ func TestGalleryQuerySorting(t *testing.T) {
-1,
-1,
},
{
"title",
"title",
models.SortDirectionEnumDesc,
-1,
-1,
},
}
qb := db.Gallery

2
pkg/sqlite/image.go
View File

@@ -1019,7 +1019,7 @@ func (qb *ImageStore) setImageSortAndPagination(q *queryBuilder, findFilter *mod
case "title":
addFilesJoin()
addFolderJoin()
sortClause = " ORDER BY images.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
sortClause = " ORDER BY COALESCE(images.title, files.basename) COLLATE NATURAL_CS " + direction + ", folders.path " + direction
default:
sortClause = getSort(sort, direction, "images")
}

2
pkg/sqlite/scene.go
View File

@@ -1446,7 +1446,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
case "title":
addFileTable()
addFolderTable()
query.sortAndPagination += " ORDER BY scenes.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
query.sortAndPagination += " ORDER BY COALESCE(scenes.title, files.basename) COLLATE NATURAL_CS " + direction + ", folders.path " + direction
case "play_count":
// handle here since getSort has special handling for _count suffix
query.sortAndPagination += " ORDER BY scenes.play_count " + direction