mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix(subsonic): getRandomSongs with genre filter

Browse source 
fix https://github.com/dweymouth/supersonic/issues/577

Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan 2025-03-12 17:34:39 -04:00
parent 0bb4b881e9
commit 7c13878075
2 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
persistence/mediafile_repository_test.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"time" "time"
"github.com/Masterminds/squirrel"
"github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/id" "github.com/navidrome/navidrome/model/id"
@ -53,17 +52,6 @@ var _ = Describe("MediaRepository", func() {
Expect(err).To(MatchError(model.ErrNotFound)) Expect(err).To(MatchError(model.ErrNotFound))
}) })
XIt("filters by genre", func() {
Expect(mr.GetAll(model.QueryOptions{
Sort: "genre.name asc, title asc",
Filters: squirrel.Eq{"genre.name": "Rock"},
})).To(Equal(model.MediaFiles{
songDayInALife,
songAntenna,
songComeTogether,
}))
})
Context("Annotations", func() { Context("Annotations", func() {
It("increments play count when the tracks does not have annotations", func() { It("increments play count when the tracks does not have annotations", func() {
id := "incplay.firsttime" id := "incplay.firsttime"

16
server/subsonic/filter/filters.go
View file

@ -95,7 +95,7 @@ func SongsByRandom(genre string, fromYear, toYear int) Options {
} }
ff := And{} ff := And{}
if genre != "" { if genre != "" {
ff = append(ff, Eq{"genre.name": genre}) ff = append(ff, filterByGenre(genre))
} }
if fromYear != 0 { if fromYear != 0 {
ff = append(ff, GtOrEq{"year": fromYear}) ff = append(ff, GtOrEq{"year": fromYear})
@ -118,11 +118,15 @@ func SongWithLyrics(artist, title string) Options {
func ByGenre(genre string) Options { func ByGenre(genre string) Options {
return addDefaultFilters(Options{ return addDefaultFilters(Options{
Sort: "name asc", Sort: "name asc",
Filters: persistence.Exists("json_tree(tags)", And{ Filters: filterByGenre(genre),
Like{"value": genre}, })
NotEq{"atom": nil}, }
}),
func filterByGenre(genre string) Sqlizer {
return persistence.Exists("json_tree(tags)", And{
Like{"value": genre},
NotEq{"atom": nil},
}) })
} }