nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-08-31 07:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

o.Path is always the current urlpath, so we can use that instead of

Browse Source 
reassembling
This commit is contained in:
Rob Emery 2025-02-02 17:49:21 +00:00
parent 99dfaf307d
commit 2c926106eb
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlna/contenddirectoryservice.go
View File

@ -122,19 +122,14 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
//TODO
log.Debug("Artist Get a track ")
} else if matchResults["ArtistAlbum"] != "" {
basePath := path.Join("/Music/Artists", matchResults["Artist"], matchResults["ArtistAlbum"])
//albumResponse, _ := cds.ds.Album(cds.ctx).Get(matchResults["ArtistAlbum"])
tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["ArtistAlbum"]}})
return cds.doMediaFiles(tracks, basePath, ret, host)
return cds.doMediaFiles(tracks, o.Path, ret, host)
} else if matchResults["Artist"] != "" {
basePath := path.Join("/Music/Artists", matchResults["Artist"])
allAlbumsForThisArtist, _ := cds.ds.Album(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_artist_id": matchResults["Artist"]}})
return cds.doAlbums(allAlbumsForThisArtist, basePath, ret, host)
return cds.doAlbums(allAlbumsForThisArtist, o.Path, ret, host)
} else {
indexes, err := cds.ds.Artist(cds.ctx).GetIndex()
@ -158,11 +153,8 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
if matchResults["AlbumTrack"] != "" {
log.Debug("TODO AlbumTrack MATCH")
} else if matchResults["AlbumTitle"] != "" {
basePath := path.Join("/Music/Albums", matchResults["AlbumTitle"])
tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["AlbumTitle"]}})
return cds.doMediaFiles(tracks, basePath, ret, host)
return cds.doMediaFiles(tracks, o.Path, ret, host)
} else {
indexes, err := cds.ds.Album(cds.ctx).GetAllWithoutGenres()
if err != nil {