heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make getTopSongs return an empty list when there's no results

Browse Source 
https://github.com/tamland/airsonic-refix/issues/99
This commit is contained in:
sentriz
2023-07-10 13:25:13 +01:00
parent c5cac5b987
commit 637aae9b36
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -554,8 +554,14 @@ func (c *Controller) ServeGetTopSongs(r *http.Request) *spec.Response {
if err != nil { if err != nil {
return spec.NewError(0, "fetching artist top tracks: %v", err) return spec.NewError(0, "fetching artist top tracks: %v", err)
} }
sub := spec.NewResponse()
sub.TopSongs = &spec.TopSongs{
Tracks: make([]*spec.TrackChild, 0),
}
if len(topTracks.Tracks) == 0 { if len(topTracks.Tracks) == 0 {
return spec.NewError(70, "no top tracks found for artist: %s", artist.Name) return sub
} }
topTrackNames := make([]string, len(topTracks.Tracks)) topTrackNames := make([]string, len(topTracks.Tracks))
@@ -576,20 +582,16 @@ func (c *Controller) ServeGetTopSongs(r *http.Request) *spec.Response {
return spec.NewError(0, "error finding tracks: %v", err) return spec.NewError(0, "error finding tracks: %v", err)
} }
if len(tracks) == 0 { if len(tracks) == 0 {
return spec.NewError(70, "no tracks found matching last fm top songs for artist: %s", artist.Name) return sub
}
sub := spec.NewResponse()
sub.TopSongs = &spec.TopSongs{
Tracks: make([]*spec.TrackChild, len(tracks)),
} }
transcodeMIME, transcodeSuffix := streamGetTransPrefProfile(c.DB, user.ID, params.GetOr("c", "")) transcodeMIME, transcodeSuffix := streamGetTransPrefProfile(c.DB, user.ID, params.GetOr("c", ""))
for i, track := range tracks { for _, track := range tracks {
sub.TopSongs.Tracks[i] = spec.NewTrackByTags(track, track.Album) tc := spec.NewTrackByTags(track, track.Album)
sub.TopSongs.Tracks[i].TranscodedContentType = transcodeMIME tc.TranscodedContentType = transcodeMIME
sub.TopSongs.Tracks[i].TranscodedSuffix = transcodeSuffix tc.TranscodedSuffix = transcodeSuffix
sub.TopSongs.Tracks = append(sub.TopSongs.Tracks, tc)
} }
return sub return sub
} }