From 9164d590718e38870073e6aad9c0c290304dd923 Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Sat, 8 Feb 2025 20:36:07 +0000 Subject: [PATCH] Another else done --- dlna/contenddirectoryservice.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlna/contenddirectoryservice.go b/dlna/contenddirectoryservice.go index 6feb2f18f..96b55aeb8 100644 --- a/dlna/contenddirectoryservice.go +++ b/dlna/contenddirectoryservice.go @@ -142,23 +142,21 @@ func handleArtist(matchResults map[string]string, ret []interface{}, cds *conten } else if matchResults["Artist"] != "" { allAlbumsForThisArtist, _ := cds.ds.Album(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_artist_id": matchResults["Artist"]}}) return cds.doAlbums(allAlbumsForThisArtist, o.Path, ret, host) - } else { - indexes, err := cds.ds.Artist(cds.ctx).GetIndex() - if err != nil { - fmt.Printf("Error retrieving Indexes: %+v", err) - return nil, err - } - for letterIndex := range indexes { - for artist := range indexes[letterIndex].Artists { - artistId := indexes[letterIndex].Artists[artist].ID - child := object{ - Path: path.Join(o.Path, indexes[letterIndex].Artists[artist].Name), - Id: path.Join(o.Path, artistId), - } - ret = append(ret, cds.cdsObjectToUpnpavObject(child, true, host)) + } + indexes, err := cds.ds.Artist(cds.ctx).GetIndex() + if err != nil { + fmt.Printf("Error retrieving Indexes: %+v", err) + return nil, err + } + for letterIndex := range indexes { + for artist := range indexes[letterIndex].Artists { + artistId := indexes[letterIndex].Artists[artist].ID + child := object{ + Path: path.Join(o.Path, indexes[letterIndex].Artists[artist].Name), + Id: path.Join(o.Path, artistId), } + ret = append(ret, cds.cdsObjectToUpnpavObject(child, true, host)) } - return ret, nil } return ret, nil }