third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-05-13 16:46:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Now returns all tracks for a given genre by a given artist

Browse Source
This commit is contained in:
Rob Emery 2025-02-02 17:07:18 +00:00
parent 9078ed7642
commit e8301cf864
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlna/contenddirectoryservice.go
View File

@ -183,19 +183,38 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
if matchResults["GenreTrack"] != "" {
log.Debug("TODO GenreTrack MATCH")
} else if matchResults["GenreArtist"] != "" {
log.Debug("TODO GenreArtist MATCH")
} else if matchResults["Genre"] != "" {
artists, err := cds.ds.Artist(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{ "genre.id": matchResults["Genre"]}})
tracks, err := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.And{
squirrel.Eq{"genre.id": matchResults["Genre"],},
squirrel.Eq{"artist_id": matchResults["GenreArtist"]},
},
})
if err != nil {
fmt.Printf("Error retrieving artists for genre: %+v", err)
fmt.Printf("Error retrieving tracks for artist and genre: %+v", err)
return nil, err
}
for artistIndex := range artists {
child := object{
Path: path.Join(o.Path, artists[artistIndex].Name),
Id: path.Join(o.Path, artists[artistIndex].ID),
//TODO do the metadata and stuff here
for trackIndex := range tracks {
child := object {
Path: path.Join(o.Path, tracks[trackIndex].Title),
Id: path.Join(o.Path, tracks[trackIndex].ID),
}
ret = append(ret, cds.cdsObjectToUpnpavObject(child, false, host))
}
} else if matchResults["Genre"] != "" {
if matchResults["GenreArtist"] == "" {
artists, err := cds.ds.Artist(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{ "genre.id": matchResults["Genre"]}})
if err != nil {
fmt.Printf("Error retrieving artists for genre: %+v", err)
return nil, err
}
for artistIndex := range artists {
child := object{
Path: path.Join(o.Path, artists[artistIndex].Name),
Id: path.Join(o.Path, artists[artistIndex].ID),
}
ret = append(ret, cds.cdsObjectToUpnpavObject(child, true, host))
}
ret = append(ret, cds.cdsObjectToUpnpavObject(child, true, host))
}
} else {
indexes, err := cds.ds.Genre(cds.ctx).GetAll()