add offset and proper year for album list
This commit is contained in:
@@ -81,6 +81,8 @@ func setSubsonicRoutes(cont handler.Controller, mux *http.ServeMux) {
|
|||||||
mux.HandleFunc("/rest/getIndexes.view", withWare(cont.GetIndexes))
|
mux.HandleFunc("/rest/getIndexes.view", withWare(cont.GetIndexes))
|
||||||
mux.HandleFunc("/rest/getMusicDirectory", withWare(cont.GetMusicDirectory))
|
mux.HandleFunc("/rest/getMusicDirectory", withWare(cont.GetMusicDirectory))
|
||||||
mux.HandleFunc("/rest/getMusicDirectory.view", withWare(cont.GetMusicDirectory))
|
mux.HandleFunc("/rest/getMusicDirectory.view", withWare(cont.GetMusicDirectory))
|
||||||
|
mux.HandleFunc("/rest/getAlbumList", withWare(cont.GetAlbumList))
|
||||||
|
mux.HandleFunc("/rest/getAlbumList.view", withWare(cont.GetAlbumList))
|
||||||
}
|
}
|
||||||
|
|
||||||
func setAdminRoutes(cont handler.Controller, mux *http.ServeMux) {
|
func setAdminRoutes(cont handler.Controller, mux *http.ServeMux) {
|
||||||
|
|||||||
@@ -88,3 +88,7 @@ func (c *Controller) GetMusicDirectory(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
respond(w, r, sub)
|
respond(w, r, sub)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// changes to this function should be reflected in in _by_tags.go's
|
||||||
|
// getAlbumListTwo() function
|
||||||
|
func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {}
|
||||||
|
|||||||
@@ -104,6 +104,8 @@ func (c *Controller) GetAlbum(w http.ResponseWriter, r *http.Request) {
|
|||||||
respond(w, r, sub)
|
respond(w, r, sub)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// changes to this function should be reflected in in _by_folder.go's
|
||||||
|
// getAlbumList() function
|
||||||
func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
|
func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
|
||||||
listType := getStrParam(r, "type")
|
listType := getStrParam(r, "type")
|
||||||
if listType == "" {
|
if listType == "" {
|
||||||
@@ -119,7 +121,11 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
|
|||||||
case "alphabeticalByName":
|
case "alphabeticalByName":
|
||||||
query = query.Order("title")
|
query = query.Order("title")
|
||||||
case "byYear":
|
case "byYear":
|
||||||
query = query.Order("year")
|
startYear := getIntParamOr(r, "fromYear", 1800)
|
||||||
|
endYear := getIntParamOr(r, "toYear", 2200)
|
||||||
|
query = query.
|
||||||
|
Where("year BETWEEN ? AND ?", startYear, endYear).
|
||||||
|
Order("year")
|
||||||
case "frequent":
|
case "frequent":
|
||||||
user := r.Context().Value(contextUserKey).(*db.User)
|
user := r.Context().Value(contextUserKey).(*db.User)
|
||||||
query = query.
|
query = query.
|
||||||
@@ -140,9 +146,11 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
|
|||||||
))
|
))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
offset := getIntParamOr(r, "offset", 0)
|
||||||
size := getIntParamOr(r, "size", 10)
|
size := getIntParamOr(r, "size", 10)
|
||||||
var albums []*db.Album
|
var albums []*db.Album
|
||||||
query.
|
query.
|
||||||
|
Offset(offset).
|
||||||
Limit(size).
|
Limit(size).
|
||||||
Preload("AlbumArtist").
|
Preload("AlbumArtist").
|
||||||
Find(&albums)
|
Find(&albums)
|
||||||
|
|||||||
Reference in New Issue
Block a user