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

Fix Last.fm API method signature

Browse Source
This commit is contained in:
Deluan
2021-06-17 23:01:24 -04:00
committed by Deluan Quintão
parent ffa76bba6a
commit 0495e421fe
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/agents/lastfm/client.go
+10 -7
View File
@@ -49,7 +49,7 @@ func (c *Client) ArtistGetInfo(ctx context.Context, name string, mbid string) (*
params.Add("artist", name) params.Add("artist", name)
params.Add("mbid", mbid) params.Add("mbid", mbid)
params.Add("lang", c.lang) params.Add("lang", c.lang)
response, err := c.makeRequest(params) response, err := c.makeRequest(params, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -62,7 +62,7 @@ func (c *Client) ArtistGetSimilar(ctx context.Context, name string, mbid string,
params.Add("artist", name) params.Add("artist", name)
params.Add("mbid", mbid) params.Add("mbid", mbid)
params.Add("limit", strconv.Itoa(limit)) params.Add("limit", strconv.Itoa(limit))
response, err := c.makeRequest(params) response, err := c.makeRequest(params, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -75,7 +75,7 @@ func (c *Client) ArtistGetTopTracks(ctx context.Context, name string, mbid strin
params.Add("artist", name) params.Add("artist", name)
params.Add("mbid", mbid) params.Add("mbid", mbid)
params.Add("limit", strconv.Itoa(limit)) params.Add("limit", strconv.Itoa(limit))
response, err := c.makeRequest(params) response, err := c.makeRequest(params, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -86,7 +86,7 @@ func (c *Client) GetToken(ctx context.Context) (string, error) {
params := url.Values{} params := url.Values{}
params.Add("method", "auth.getToken") params.Add("method", "auth.getToken")
c.sign(params) c.sign(params)
response, err := c.makeRequest(params) response, err := c.makeRequest(params, true)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -97,18 +97,21 @@ func (c *Client) GetSession(ctx context.Context, token string) (string, error) {
params := url.Values{} params := url.Values{}
params.Add("method", "auth.getSession") params.Add("method", "auth.getSession")
params.Add("token", token) params.Add("token", token)
c.sign(params) response, err := c.makeRequest(params, true)
response, err := c.makeRequest(params)
if err != nil { if err != nil {
return "", err return "", err
} }
return response.Session.Key, nil return response.Session.Key, nil
} }
func (c *Client) makeRequest(params url.Values) (*Response, error) { func (c *Client) makeRequest(params url.Values, signed bool) (*Response, error) {
params.Add("format", "json") params.Add("format", "json")
params.Add("api_key", c.apiKey) params.Add("api_key", c.apiKey)
if signed {
c.sign(params)
}
req, _ := http.NewRequest("GET", apiBaseUrl, nil) req, _ := http.NewRequest("GET", apiBaseUrl, nil)
req.URL.RawQuery = params.Encode() req.URL.RawQuery = params.Encode()