arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Retry calls to Last.FM without MBIDs when if returns artist invalid (#1138)

Browse Source 
* Call Last.FM's getInfo again without mbid when artist is not found

* Call Last.FM's getSimilar again without mbid when artist is not found

* Call Last.FM's getTopTracks again without mbid when artist is not found
This commit is contained in:
Deluan Quintão
2021-05-27 20:53:24 -04:00
committed by GitHub
parent 4e0177ee53
commit 89b12b34be
12 changed files with 288 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/lastfm/client.go
+26 -18
View File
@@ -14,6 +14,15 @@ const (
apiBaseUrl = "https://ws.audioscrobbler.com/2.0/"
)
type Error struct {
Code int
Message string
}
func (e *Error) Error() string {
return fmt.Sprintf("last.fm error(%d): %s", e.Code, e.Message)
}
type httpDoer interface {
Do(req *http.Request) (*http.Response, error)
}
@@ -46,14 +55,22 @@ func (c *Client) makeRequest(params url.Values) (*Response, error) {
return nil, err
}
if resp.StatusCode != 200 {
return nil, c.parseError(data)
var response Response
jsonErr := json.Unmarshal(data, &response)
if resp.StatusCode != 200 && jsonErr != nil {
return nil, fmt.Errorf("last.fm http status: (%d)", resp.StatusCode)
}
var response Response
err = json.Unmarshal(data, &response)
if jsonErr != nil {
return nil, jsonErr
}
return &response, err
if response.Error != 0 {
return &response, &Error{Code: response.Error, Message: response.Message}
}
return &response, nil
}
func (c *Client) ArtistGetInfo(ctx context.Context, name string, mbid string) (*Artist, error) {
@@ -69,7 +86,7 @@ func (c *Client) ArtistGetInfo(ctx context.Context, name string, mbid string) (*
return &response.Artist, nil
}
func (c *Client) ArtistGetSimilar(ctx context.Context, name string, mbid string, limit int) ([]Artist, error) {
func (c *Client) ArtistGetSimilar(ctx context.Context, name string, mbid string, limit int) (*SimilarArtists, error) {
params := url.Values{}
params.Add("method", "artist.getSimilar")
params.Add("artist", name)
@@ -79,10 +96,10 @@ func (c *Client) ArtistGetSimilar(ctx context.Context, name string, mbid string,
if err != nil {
return nil, err
}
return response.SimilarArtists.Artists, nil
return &response.SimilarArtists, nil
}
func (c *Client) ArtistGetTopTracks(ctx context.Context, name string, mbid string, limit int) ([]Track, error) {
func (c *Client) ArtistGetTopTracks(ctx context.Context, name string, mbid string, limit int) (*TopTracks, error) {
params := url.Values{}
params.Add("method", "artist.getTopTracks")
params.Add("artist", name)
@@ -92,14 +109,5 @@ func (c *Client) ArtistGetTopTracks(ctx context.Context, name string, mbid strin
if err != nil {
return nil, err
}
return response.TopTracks.Track, nil
}
func (c *Client) parseError(data []byte) error {
var e Error
err := json.Unmarshal(data, &e)
if err != nil {
return err
}
return fmt.Errorf("last.fm error(%d): %s", e.Code, e.Message)
return &response.TopTracks, nil
}