arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add fromYear/toYear params to getRandomSongs

Browse Source
This commit is contained in:
Deluan
2020-04-17 21:18:04 -04:00
committed by Deluan Quintão
parent 0e1735e7a9
commit 4c0250f9f8
3 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/subsonic/album_lists.go
+4 -2
View File
@@ -27,7 +27,7 @@ func (c *AlbumListController) getNewAlbumList(r *http.Request) (engine.Entries,
return nil, err
}
var filter engine.AlbumFilter
var filter engine.ListFilter
switch typ {
case "newest":
filter = engine.ByNewest()
@@ -141,8 +141,10 @@ func (c *AlbumListController) GetNowPlaying(w http.ResponseWriter, r *http.Reque
func (c *AlbumListController) GetRandomSongs(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
size := utils.MinInt(utils.ParamInt(r, "size", 10), 500)
genre := utils.ParamString(r, "genre")
fromYear := utils.ParamInt(r, "fromYear", 0)
toYear := utils.ParamInt(r, "toYear", 0)
songs, err := c.listGen.GetRandomSongs(r.Context(), size, genre)
songs, err := c.listGen.GetSongs(r.Context(), 0, size, engine.RandomSongs(genre, fromYear, toYear))
if err != nil {
log.Error(r, "Error retrieving random songs", "error", err)
return nil, NewError(responses.ErrorGeneric, "Internal Error")
server/subsonic/album_lists_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ type fakeListGen struct {
recvSize int
}
func (lg *fakeListGen) GetAlbums(ctx context.Context, offset int, size int, filter engine.AlbumFilter) (engine.Entries, error) {
func (lg *fakeListGen) GetAlbums(ctx context.Context, offset int, size int, filter engine.ListFilter) (engine.Entries, error) {
if lg.err != nil {
return nil, lg.err
}