DSCGS-11 Improve SearchService

This commit is contained in:
irlndts 2018-03-13 00:12:06 +03:00
parent b8ec73e2a0
commit 1091d9be02
6 changed files with 23 additions and 23 deletions

Binary file not shown.

BIN
.search.go.swp Normal file

Binary file not shown.

View File

@ -64,7 +64,7 @@ func NewClient(o *Options) (*Client, error) {
Artist: newArtistService(o.URL + "/artists/"),
Label: newLabelService(o.URL + "/labels/"),
Master: newMasterService(o.URL + "/masters/"),
Search: newSearchService(base.New()),
Search: newSearchService(o.URL + "/database/search"),
}, nil
}
@ -100,6 +100,7 @@ func request(path string, params url.Values, resp interface{}) error {
if err != nil {
return err
}
fmt.Println(string(body))
return json.Unmarshal(body, &resp)
}

View File

@ -2,6 +2,7 @@ package main
import (
"fmt"
"net/url"
"github.com/irlndts/go-discogs"
)
@ -17,7 +18,9 @@ func main() {
return
}
release, err := d.Master.Versions(1147170, nil)
params := url.Values{}
params.Set("q", "Ska-Jazz Review")
release, err := d.Search.Search(params)
if err != nil {
fmt.Println(err)
return

View File

@ -1,17 +1,19 @@
package discogs
import (
"net/http"
"github.com/irlndts/go-apirequest"
)
import "net/url"
// SearchService ...
type SearchService struct {
api *apirequest.API
url string
}
// SerachRequest describes search request json
func newSearchService(url string) *SearchService {
return &SearchService{
url: url,
}
}
// SerachRequest describes search request
type SearchRequest struct {
Q string // search query (optional)
Type string // one of release, master, artist, label (optional)
@ -33,7 +35,7 @@ type SearchRequest struct {
Contributer string // search contributor usernames (optional)
Page int // optional
Per_page int // optional
PerPage int // optional
}
// Search describes search response
@ -60,20 +62,14 @@ type Result struct {
ID int `json:"id,omitempty"`
}
func newSearchService(api *apirequest.API) *SearchService {
return &SearchService{
api: api.Path("database/search"),
}
}
// Search makes search request to discogs.
// Issue a search query to our database. This endpoint accepts pagination parameters.
// Authentication (as any user) is required.
// https://www.discogs.com/developers/#page:database,header:database-search
func (self *SearchService) Search(params *SearchRequest) (*Search, *http.Response, error) {
search := new(Search)
apiError := new(APIError)
resp, err := self.api.New().QueryStruct(params).Receive(search, apiError)
return search, resp, relevantError(err, *apiError)
func (s *SearchService) Search(params url.Values) (*Search, error) {
var search *Search
if err := request(s.url, params, &search); err != nil {
return nil, err
}
return search, nil
}