From d725743594dfcd8eea25024f8456c9c103dadb1a Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 3 Aug 2016 11:50:33 -0700 Subject: [PATCH] #35 improve code structure --- gogs.go | 2 +- issue_label.go | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gogs.go b/gogs.go index f6c6648..d614e83 100644 --- a/gogs.go +++ b/gogs.go @@ -14,7 +14,7 @@ import ( ) func Version() string { - return "0.10.0" + return "0.10.1" } // Client represents a Gogs API client. diff --git a/issue_label.go b/issue_label.go index 7c80bb2..ce6a64d 100644 --- a/issue_label.go +++ b/issue_label.go @@ -16,11 +16,6 @@ type Label struct { Color string `json:"color"` } -type LabelOption struct { - Name string `json:"name"` - Color string `json:"color"` -} - func (c *Client) ListRepoLabels(owner, repo string) ([]*Label, error) { labels := make([]*Label, 0, 10) return labels, c.getParsedResponse("GET", fmt.Sprintf("/repos/%s/%s/labels", owner, repo), nil, nil, &labels) @@ -31,7 +26,12 @@ func (c *Client) GetRepoLabel(owner, repo string, id int64) (*Label, error) { return label, c.getParsedResponse("GET", fmt.Sprintf("/repos/%s/%s/labels/%d", owner, repo, id), nil, nil, label) } -func (c *Client) CreateLabel(owner, repo string, opt LabelOption) (*Label, error) { +type CreateLabelOption struct { + Name string `json:"name" binding:"Required"` + Color string `json:"color" binding:"Required;Size(7)"` +} + +func (c *Client) CreateLabel(owner, repo string, opt CreateLabelOption) (*Label, error) { body, err := json.Marshal(&opt) if err != nil { return nil, err @@ -41,7 +41,12 @@ func (c *Client) CreateLabel(owner, repo string, opt LabelOption) (*Label, error jsonHeader, bytes.NewReader(body), label) } -func (c *Client) EditLabel(owner, repo string, id int64, opt LabelOption) (*Label, error) { +type EditLabelOption struct { + Name *string `json:"name"` + Color *string `json:"color"` +} + +func (c *Client) EditLabel(owner, repo string, id int64, opt EditLabelOption) (*Label, error) { body, err := json.Marshal(&opt) if err != nil { return nil, err