From 7a214b4b15b010b1cceb76732d29af4540722bea Mon Sep 17 00:00:00 2001
From: irlndts <kleto4kin@gmail.com>
Date: Mon, 12 Mar 2018 23:31:47 +0300
Subject: [PATCH] DSCGS-10 Rewrite LabelService

---
 .discogs.go.swp | Bin 0 -> 12288 bytes
 .models.go.swp  | Bin 0 -> 16384 bytes
 discogs.go      |   2 +-
 labels.go       |  74 ++++++++++++------------
 models.go       | 148 +++++++++++++++++++++++++++---------------------
 5 files changed, 120 insertions(+), 104 deletions(-)
 create mode 100644 .discogs.go.swp
 create mode 100644 .models.go.swp

diff --git a/.discogs.go.swp b/.discogs.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..175473ddd4c9d921175b96fa88addcb9c246ce8e
GIT binary patch
literal 12288
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
ahY%I>%S}K;tDQ;ftj*#@<Z-v(kbePi6hRvR

literal 0
HcmV?d00001

diff --git a/.models.go.swp b/.models.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..61ae0278aed9b6a6efab98c9e748796234583c50
GIT binary patch
literal 16384
zcmeI3ZEPIH8OH}oOOB9+7ty3&s^!`W+ltQ)5h+-*D(9ubG@*&@7?GEnxx2Bw<Zkzv
zoprDfO{%n1Rn=BS72l8`Q411OMFI)hekc-wB#1O=`+>Hp-~;0AQxK^@@P+=L*_peY
z^*I-$Qnk{o^pm~wJUcVbf1aJ)nYF9K)8pHNn=8W%$5o6CzwztcN&U<0)eVe=vJur)
zLY502V^WD`GPs@BHpTJ&!Ld+Q8gY#`iWhy)R5&yj4<)iTG#9G*v|6df&7qEEupTD0
zcrF=g#&yw1DsyqM8h`E;@Ctld1yVITc=IZ@;l}m)R{v`G`rz7Yc757fyuVk#E8rFI
z3U~#)0$u^HfLFjP@PDj;YF)|>qW_ng7=B@XUQ+n^IdhI}0ew7Zep)|s>VJ3zyaHYU
zuYgy;E8rFI3U~#)0$u^HfLFjP@IR;kuj|kL4BG(u7rXv{Z#84*z+2!fI0OC!PJ!pa
zli)De2S&ge@WB@u`xiJ5UI)j(QE(V=@J(<XIKPUq)8G_%1^f{_0e%GPU<9lMA707W
zU%{Wj8Sn!5EjR>rg0F**Rx<VyI0jw-Pl1O(0&W8XU<G*X3da5k&VrNRDey~h0Hi>H
zS+Em)4SZ69FZet78#oD`20sNH41-nRofVAz0sIa;2Oa}I2m8Q!a5*@8Ir<F_foU)W
zCc!2!02uhk7tjuP6`TamfCqsDEf9mfU=vsi-v2yf?}2mR4R8iL34Q|hgKvWY&<Ab+
zYXAdpUdGtV-~>1ho&!g~L9iQa1YZK@vEg$H90do#UT_Qe2G|Jtz_s8U^5!)74LA(G
z4-Ns!rx+BEp`l<htu}bIA%aS!!r1++G$E2Wl{K+zVq1_X8Afx#U3VvOG*XtvGLy<i
z`7Tzvoi{~b4%ah+g*?W$SbGqJk)jh*S6C<eSWSfsrjBYHH#&B%E$~r`EfH)N&8m>p
zowTNc`xyFdifpf^LWLNz!|jVA3pF-1pEj%AUC2T%lZvY}=~hdkE#!0Y`b>z1;EAYH
zeQuwmu~2>6cvVo~bhus^7ommjCF8eZ+2mT?VimL6Ld|TB(@4q1F3r?3i+18FinU9z
zq8eG?qK9Kz$Rvy-XFP0~9gy3_y{ZsTgrY3sq-bjJgiN}2Bwn&D%v{>T-7d8C@8ENS
zM#`jBJF!|+POZ=t6iWL_lX*y9ZKn#z-mL<<ew_Y{s*63Oa&p)qq^@I01wzhHFKj&8
zDWAH!z{asF5t42f>WVx3sj*O77oBuk!Oby-I;^HDcJG;dxouzPMJ`OEl1>V0d2B&Q
zQfjslbG6|{d;jvR*v2@)6-^ZRC{2-V=d*|tb5}D|sxUKjN^RSB@NDiOjXUG5&rG-n
z;6c%Lu7%Y(v4JPHP3@kWFYM^)YTN0Un>R9vGP4oK^_AL#>b({68rw1*o`(l{ZsCgW
zOnD<zxV26GxV2`5<eMA*B-pbrcWQ&HbrOeC+$2-8nMPE9esnj-w$zH8Pf_&1^u_3V
zp-0CO=Wb6AICXn~Y>hCzFHYeZp&v$Wqe2^JD2f?dXXgT~(y|w5y>heRl1@4kBGhQ{
zXo*6)%<8j~M#vtf-FBMXqZX+}9mH}zHiRuAsmZXVFay&tx*^naMmvJ$@c_s6bZUxh
z-==vZ6@?*Npfc(dsaqUR($rQzUMHbv!@_Nd`O_BLX7VZGcKbs4;d)vXdOZ{K1MSv8
z-BOD>EhxOrxlwi<ogvnb=}G-&<lG4PavSH?dzIu|Dm=t!gzy)+_|05vZU{UI+b$iE
z&Cr`}*hDaw=secGxpy5qXhmQ9(z7E@Ldq0v?_O`qxKPzwQksM==w3H2aHk#xQ<B&A
zJCbB2R*YQ}<Lhr4&id!-o5~OtY8E~=02`1A8a_H?orB#fF`0PrPsq|8VO`Ce=G-~u
z09mNHTSYiGZ(gWemw9cmv5z<D(TJ$pH&#|+W7kU1O9T!#c8q>)zkZFFh}$o&1s@3u
z_2xfy+l-*D+u|_Gg(W?@8y0G<*Nrt6E$Dcb#>ArqD~yx!d3_v%m8tje=Q6&aqfPX!
zSRv>)ZS>1sO3>OtuQu|@?T%_Lr%So%wJ;vJxz)xw9o9wcBtTZ8BkO0SGJ1=L>OvX6
zMnVnI%87-|RxDM}hjkf}fHKJZl|7^NKdpWDVvS6H|8KwVzl-(!3Gg_00Q>;ZdOrda
zpaNEcx3Qi-4ju-JU>a-ySA(~)hJO(p1&@M9z|TMmwt+$L6|fqt0#|~+U`_uk@DTVh
zcmVtmG{J5#3PwN~e2hMS2;Kz02hV~dpaq)XyMW@_1N`9?@CtYZyaHYUuYgy;E8rFQ
ztQEkg4JlMAqoBnlZzimSl2Z12Wm2fVa?5VquA?`4dTp<atC;t-DrT#<A8+*GY|uUr
zt{)AC@i}5?O|<>Hv=)?hs-XA&<*rY#KA4GRT}af@s!ZbaJ9K8-Zx>Jv<#M+!P!;Wq
z^VfAQ$zl&iMguHMDtZqnx$l0Kg=4ge!bTQzFghCG1WnDRQ7!0e1q0Z}4kNu?&>yIH
zhgP+(KUZ1yrN){9QdCH6iC}k}n=8#=;QBy{ds2aIf4%X9|8vIh*e!Ow`G-@|OdnXj
zVYAlCV%KT-EX0%Ax_}mHnK|<|OGcO%1()jr{YhwDkbNA<b}>4!IIFo_v0bcA_1=o;
zxuV~W@Xgnu!nS4;mKpPTh*slwqQhAb#SKsjg*>KuuZ{ofU%q<nA(-t)9hkeG&&Gt}
z>b);l$~F_6F*e&qTyMGARl1S7%kG_Pu|u5ShIPAlvAd7UZ`owuPW8?izAxYtA9jDx
IMz(?UZ=xJYyZ`_I

literal 0
HcmV?d00001

diff --git a/discogs.go b/discogs.go
index 8c39d8c..f08aa57 100644
--- a/discogs.go
+++ b/discogs.go
@@ -62,7 +62,7 @@ func NewClient(o *Options) (*Client, error) {
 	return &Client{
 		Release: newReleaseService(o.URL+"/releases/", cur),
 		Artist:  newArtistService(o.URL + "/artists/"),
-		Label:   newLabelService(base.New()),
+		Label:   newLabelService(o.URL + "/labels/"),
 		Master:  newMasterService(o.URL + "/masters/"),
 		Search:  newSearchService(base.New()),
 	}, nil
diff --git a/labels.go b/labels.go
index e5e484c..94a9e6e 100644
--- a/labels.go
+++ b/labels.go
@@ -1,58 +1,56 @@
 package discogs
 
 import (
-	"net/http"
-
-	"github.com/irlndts/go-apirequest"
+	"strconv"
 )
 
+// LabelService ...
 type LabelService struct {
-	api *apirequest.API
+	url string
 }
 
-type LabelParams struct {
-	Label_id string
-	Page     int
-	Per_Page int
+func newLabelService(url string) *LabelService {
+	return &LabelService{
+		url: url,
+	}
 }
 
+// Label resource represents a label, company, recording studio, location,
+// or other entity involved with artists and releases.
 type Label struct {
-	Profile      string     `json:"profile"`
-	Releases_url string     `json:"releases_url"`
-	Name         string     `json:"name"`
-	Contact_info string     `json:"contact_info"`
-	Uri          string     `json:"uri"`
-	Sublabels    []Sublable `json:"sublabels"`
-	Urls         []string   `json:"urls"`
-	Images       []Image    `json:"images"`
-	Resource_url string     `json:"resource_url"`
-	Id           int        `json:"id"`
-	Data_quality string     `json:"data_quality"`
+	Profile     string     `json:"profile"`
+	ReleasesURL string     `json:"releases_url"`
+	Name        string     `json:"name"`
+	ContactInfo string     `json:"contact_info"`
+	URI         string     `json:"uri"`
+	Sublabels   []Sublable `json:"sublabels"`
+	URLs        []string   `json:"urls"`
+	Images      []Image    `json:"images"`
+	ResourceURL string     `json:"resource_url"`
+	ID          int        `json:"id"`
+	DataQuality string     `json:"data_quality"`
 }
 
+// Label returns a label.
+func (s *LabelService) Label(labelID int) (*Label, error) {
+	var label *Label
+	if err := request(s.url+strconv.Itoa(labelID), nil, &label); err != nil {
+		return nil, err
+	}
+	return label, nil
+}
+
+// LabelReleases is a list of Releases associated with the label.
 type LabelReleases struct {
 	Pagination Page            `json:"pagination"`
 	Releases   []ReleaseSource `json:"releases"`
 }
 
-func newLabelService(api *apirequest.API) *LabelService {
-	return &LabelService{
-		api: api.Path("labels/"),
+// Releases returns a list of Releases associated with the label.
+func (s *LabelService) Releases(labelID int, pagination *Pagination) (*LabelReleases, error) {
+	var releases *LabelReleases
+	if err := request(s.url+strconv.Itoa(labelID)+"/releases", pagination.toParams(), &releases); err != nil {
+		return nil, err
 	}
-}
-
-func (self *LabelService) Label(params *LabelParams) (*Label, *http.Response, error) {
-	label := new(Label)
-	apiError := new(APIError)
-
-	resp, err := self.api.New().Get(params.Label_id).Receive(label, apiError)
-	return label, resp, relevantError(err, *apiError)
-}
-
-func (self *LabelService) Releases(params *LabelParams) (*LabelReleases, *http.Response, error) {
-	releases := new(LabelReleases)
-	apiError := new(APIError)
-
-	resp, err := self.api.New().Get(params.Label_id+"/releases").QueryStruct(params).Receive(releases, apiError)
-	return releases, resp, relevantError(err, *apiError)
+	return releases, nil
 }
diff --git a/models.go b/models.go
index a2c50c4..c8f40b1 100644
--- a/models.go
+++ b/models.go
@@ -5,33 +5,37 @@ import (
 	"strconv"
 )
 
+// Video ...
 type Video struct {
 	Description string `json:"description"`
 	Duration    int    `json:"duration"`
 	Embed       bool   `json:"embed"`
 	Title       string `json:"title"`
-	Uri         string `json:"uri"`
+	URI         string `json:"uri"`
 }
 
+// ArtistSource ...
 type ArtistSource struct {
-	Anv          string `json:"anv"`
-	Id           int    `json:"id"`
-	Join         string `json:"join"`
-	Name         string `json:"name:`
-	Resource_url string `json:"resource_url"`
-	Role         string `json:"role"`
-	Tracks       string `json:"tracks"`
+	Anv         string `json:"anv"`
+	ID          int    `json:"id"`
+	Join        string `json:"join"`
+	Name        string `json:"name:`
+	ResourceURL string `json:"resource_url"`
+	Role        string `json:"role"`
+	Tracks      string `json:"tracks"`
 }
 
+// Image ...
 type Image struct {
-	Height       int    `json:"height"`
-	Width        int    `json:"width"`
-	Resource_url string `json:"resource_url"`
-	Type         string `json:"type"`
-	Uri          string `json:"uri"`
-	Uri150       string `json:"uri150"`
+	Height      int    `json:"height"`
+	Width       int    `json:"width"`
+	ResourceURL string `json:"resource_url"`
+	Type        string `json:"type"`
+	URI         string `json:"uri"`
+	URI150      string `json:"uri150"`
 }
 
+// Track ...
 type Track struct {
 	Duration     string         `json:"duration"`
 	Position     string         `json:"position"`
@@ -40,37 +44,42 @@ type Track struct {
 	Extraartists []ArtistSource `json:"extraartists"`
 }
 
+// LabelSource ...
 type LabelSource struct {
-	Catno        string `json:"catno"`
-	Entity_type  string `json:"entity_type"`
-	Id           int    `json:"id"`
-	Name         string `json:"name"`
-	Resource_url string `json:"resource_url"`
+	Catno       string `json:"catno"`
+	EntityType  string `json:"entity_type"`
+	ID          int    `json:"id"`
+	Name        string `json:"name"`
+	ResourceURL string `json:"resource_url"`
 }
 
+// Itentifier ...
 type Identifier struct {
 	Type  string `json:"type"`
 	Value string `json:"value"`
 }
 
+// Format ...
 type Format struct {
 	Descriptions []string `json:"descriptions"`
 	Name         string   `json:"name"`
 	Qty          string   `json:"qty"`
 }
 
+// Company ...
 type Company struct {
-	Catno            string `json:"catno"`
-	Entity_type      string `json:"entity_type"`
-	Entity_type_name string `json:"entity_type_name"`
-	Id               int    `json:"id"`
-	Name             string `json:"name"`
-	Resource_url     string `json:"resource_url"`
+	Catno          string `json:"catno"`
+	EntityType     string `json:"entity_type"`
+	EntityTypeName string `json:"entity_type_name"`
+	ID             int    `json:"id"`
+	Name           string `json:"name"`
+	ResourceURL    string `json:"resource_url"`
 }
 
+// Community ...
 type Community struct {
 	Contributors []Contributor `json:"contributors"`
-	Data_quality string        `json:"string"`
+	DataQuality  string        `json:"string"`
 	Have         int           `json:"have"`
 	Rating       Rating        `json:"rating"`
 	Status       string        `json:"status"`
@@ -78,73 +87,82 @@ type Community struct {
 	Want         int           `json:"want"`
 }
 
+// Submitter ...
 type Submitter struct {
-	Resource_url string `json:"resource_url"`
-	Username     string `json:"username"`
+	ResourceURL string `json:"resource_url"`
+	Username    string `json:"username"`
 }
 
+// Rating ...
 type Rating struct {
 	Average float32 `json:"average"`
 	Count   int     `json:"count"`
 }
 
+// Contributor ...
 type Contributor struct {
-	Resource_url string `json:"resource_url"`
-	Username     string `json:"username"`
+	ResourceURL string `json:"resource_url"`
+	Username    string `json:"username"`
 }
 
+// Page ...
 type Page struct {
-	Per_page int  `json:"per_page"`
-	Items    int  `json:"items"`
-	Page     int  `json:"page"`
-	Urls     URLS `json:"urls"`
-	Pages    int  `json:"pages"`
+	PerPage int      `json:"per_page"`
+	Items   int      `json:"items"`
+	Page    int      `json:"page"`
+	URLs    URLsList `json:"urls"`
+	Pages   int      `json:"pages"`
 }
 
-type URLS struct {
+// URLsList ...
+type URLsList struct {
 	Last string `json:"last"`
 	Next string `json:"next"`
 }
 
+// Version ...
 type Version struct {
-	Catno        string `json:"catno"`
-	Country      string `json:"country"`
-	Format       string `json:"format"`
-	Id           int    `json:"id"`
-	Label        string `json:"label"`
-	Released     string `json:"released"`
-	Resource_url string `json:"resource_url"`
-	Status       string `json:"status"`
-	Thumb        string `json:"thumb"`
-	Title        string `json:"title"`
+	Catno       string `json:"catno"`
+	Country     string `json:"country"`
+	Format      string `json:"format"`
+	ID          int    `json:"id"`
+	Label       string `json:"label"`
+	Released    string `json:"released"`
+	ResourceURL string `json:"resource_url"`
+	Status      string `json:"status"`
+	Thumb       string `json:"thumb"`
+	Title       string `json:"title"`
 }
 
+// Member ...
 type Member struct {
-	Active       bool   `json:"active"`
-	Id           int    `json:"id"`
-	Name         string `json:"name"`
-	Resource_url string `json:"resource_url"`
+	Active      bool   `json:"active"`
+	ID          int    `json:"id"`
+	Name        string `json:"name"`
+	ResourceURL string `json:"resource_url"`
 }
 
+// Sublable ...
 type Sublable struct {
-	Resource_url string `json:"url"`
-	Id           int    `json:"id"`
-	Name         string `json:"name"`
+	ResourceURL string `json:"url"`
+	ID          int    `json:"id"`
+	Name        string `json:"name"`
 }
 
+// ReleaseSource ...
 type ReleaseSource struct {
-	Artist       string `json:"artist"`
-	Catno        string `json:"catno"`
-	Format       string `json:"format"`
-	Id           int    `json:"id"`
-	Resource_url string `json:"resource_url"`
-	Status       string `json:"status"`
-	Thumb        string `json:"thumb"`
-	Title        string `json:"title"`
-	Year         int    `json:"year"`
-	Main_release int    `json:"main_release"`
-	Role         string `json:"role"`
-	Type         string `json:"type"`
+	Artist      string `json:"artist"`
+	Catno       string `json:"catno"`
+	Format      string `json:"format"`
+	ID          int    `json:"id"`
+	ResourceURL string `json:"resource_url"`
+	Status      string `json:"status"`
+	Thumb       string `json:"thumb"`
+	Title       string `json:"title"`
+	Year        int    `json:"year"`
+	MainRelease int    `json:"main_release"`
+	Role        string `json:"role"`
+	Type        string `json:"type"`
 }
 
 // Pagination ...