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

use http.Method* strings in lastfm tests

Browse Source
This commit is contained in:
sentriz
2023-09-26 01:15:58 +01:00
parent 9026c9e2c0
commit d77b0ebf4c
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scrobble/lastfm/client.go
View File

@@ -78,7 +78,7 @@ func (c *Client) ArtistGetInfo(apiKey string, artistName string) (Artist, error)
params.Add("method", "artist.getInfo") params.Add("method", "artist.getInfo")
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("artist", artistName) params.Add("artist", artistName)
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return Artist{}, fmt.Errorf("making artist GET: %w", err) return Artist{}, fmt.Errorf("making artist GET: %w", err)
} }
@@ -90,7 +90,7 @@ func (c *Client) ArtistGetTopTracks(apiKey, artistName string) (TopTracks, error
params.Add("method", "artist.getTopTracks") params.Add("method", "artist.getTopTracks")
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("artist", artistName) params.Add("artist", artistName)
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return TopTracks{}, fmt.Errorf("making track GET: %w", err) return TopTracks{}, fmt.Errorf("making track GET: %w", err)
} }
@@ -103,7 +103,7 @@ func (c *Client) TrackGetSimilarTracks(apiKey string, artistName, trackName stri
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("track", trackName) params.Add("track", trackName)
params.Add("artist", artistName) params.Add("artist", artistName)
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return SimilarTracks{}, fmt.Errorf("making track GET: %w", err) return SimilarTracks{}, fmt.Errorf("making track GET: %w", err)
} }
@@ -115,7 +115,7 @@ func (c *Client) ArtistGetSimilar(apiKey string, artistName string) (SimilarArti
params.Add("method", "artist.getSimilar") params.Add("method", "artist.getSimilar")
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("artist", artistName) params.Add("artist", artistName)
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return SimilarArtists{}, fmt.Errorf("making similar artists GET: %w", err) return SimilarArtists{}, fmt.Errorf("making similar artists GET: %w", err)
} }
@@ -128,9 +128,9 @@ func (c *Client) UserGetLovedTracks(apiKey string, userName string) (LovedTracks
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("user", userName) params.Add("user", userName)
params.Add("limit", "1000") // TODO: paginate params.Add("limit", "1000") // TODO: paginate
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return LovedTracks{}, fmt.Errorf("making lovedTracks users GET: %w", err) return LovedTracks{}, fmt.Errorf("making user get loved tracks GET: %w", err)
} }
return resp.LovedTracks, nil return resp.LovedTracks, nil
} }
@@ -141,7 +141,7 @@ func (c *Client) GetSession(apiKey, secret, token string) (string, error) {
params.Add("api_key", apiKey) params.Add("api_key", apiKey)
params.Add("token", token) params.Add("token", token)
params.Add("api_sig", getParamSignature(params, secret)) params.Add("api_sig", getParamSignature(params, secret))
resp, err := c.makeRequest("GET", params) resp, err := c.makeRequest(http.MethodGet, params)
if err != nil { if err != nil {
return "", fmt.Errorf("making session GET: %w", err) return "", fmt.Errorf("making session GET: %w", err)
} }

3
scrobble/lastfm/scrobbler.go
View File

@@ -2,6 +2,7 @@ package lastfm
import ( import (
"fmt" "fmt"
"net/http"
"net/url" "net/url"
"strconv" "strconv"
"strings" "strings"
@@ -68,6 +69,6 @@ func (s *Scrobbler) Scrobble(user *db.User, track *db.Track, stamp time.Time, su
params.Add("api_sig", getParamSignature(params, secret)) params.Add("api_sig", getParamSignature(params, secret))
_, err = s.client.makeRequest("POST", params) _, err = s.client.makeRequest(http.MethodPost, params)
return err return err
} }