heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore(build)!: bump to go 1.21

Browse Source 
Release-As: 0.16.0
This commit is contained in:
sentriz
2023-09-07 17:52:24 +01:00
parent 657fb221db
commit 658bae2b43
10 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/ctrlsubsonic/handlers_by_folder.go
View File

@@ -131,15 +131,12 @@ func (c *Controller) ServeGetAlbumList(r *http.Request) *spec.Response {
case "alphabeticalByName":
q = q.Order("right_path")
case "byYear":
fromYear := params.GetOrInt("fromYear", 1800)
toYear := params.GetOrInt("toYear", 2200)
if fromYear > toYear {
q = q.Where("tag_year BETWEEN ? AND ?", toYear, fromYear)
q = q.Order("tag_year DESC")
} else {
q = q.Where("tag_year BETWEEN ? AND ?", fromYear, toYear)
q = q.Order("tag_year")
}
y1, y2 :=
params.GetOrInt("fromYear", 1800),
params.GetOrInt("toYear", 2200)
// support some clients sending wrong order like DSub
q = q.Where("tag_year BETWEEN ? AND ?", min(y1, y2), max(y1, y2))
q = q.Order("tag_year DESC")
case "byGenre":
genre, _ := params.Get("genre")
q = q.Joins("JOIN album_genres ON album_genres.album_id=albums.id")

15
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -145,15 +145,12 @@ func (c *Controller) ServeGetAlbumListTwo(r *http.Request) *spec.Response {
case "alphabeticalByName":
q = q.Order("tag_title")
case "byYear":
fromYear := params.GetOrInt("fromYear", 1800)
toYear := params.GetOrInt("toYear", 2200)
if fromYear > toYear {
q = q.Where("tag_year BETWEEN ? AND ?", toYear, fromYear)
q = q.Order("tag_year DESC")
} else {
q = q.Where("tag_year BETWEEN ? AND ?", fromYear, toYear)
q = q.Order("tag_year")
}
y1, y2 :=
params.GetOrInt("fromYear", 1800),
params.GetOrInt("toYear", 2200)
// support some clients sending wrong order like DSub
q = q.Where("tag_year BETWEEN ? AND ?", min(y1, y2), max(y1, y2))
q = q.Order("tag_year DESC")
case "byGenre":
genre, _ := params.Get("genre")
q = q.Joins("JOIN album_genres ON album_genres.album_id=albums.id")