Skip to content

Commit 39c0752

Browse files
vishrvishr
committed
Bumped v0.18.4
Signed-off-by: Vishal Rana <[email protected]>
1 parent 81d4837 commit 39c0752

File tree

10 files changed

+56
-50
lines changed

10 files changed

+56
-50
lines changed

‎barcode.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func (c *Client) BarcodeGenerate(req *BarcodeGenerateRequest) (*BarcodeGenerateR
3636
Message: e.Error(),
3737
}
3838
}
39-
if success(r) {
40-
return res, nil
39+
if c.error(r) {
40+
return nil, err
4141
}
42-
return nil, err
42+
return res, nil
4343
}
4444

4545
func (c *Client) BarcodeScan(req *BarcodeScanRequest) (*BarcodeScanResponse, *APIError) {
@@ -55,8 +55,8 @@ func (c *Client) BarcodeScan(req *BarcodeScanRequest) (*BarcodeScanResponse, *AP
5555
Message: e.Error(),
5656
}
5757
}
58-
if success(r) {
59-
return res, nil
58+
if c.error(r) {
59+
return nil, err
6060
}
61-
return nil, err
61+
return res, nil
6262
}

‎client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ const (
3030
apiURL = "https://api.labstack.com"
3131
)
3232

33-
func success(r *resty.Response) bool {
34-
return r.StatusCode() >= 200 && r.StatusCode() < 300
35-
}
36-
3733
// NewClient creates a new client for the LabStack API.
3834
func NewClient(apiKey string) *Client {
3935
return &Client{
@@ -43,6 +39,10 @@ func NewClient(apiKey string) *Client {
4339
}
4440
}
4541

42+
func (c *Client) error(r *resty.Response) bool {
43+
return r.StatusCode() < 200 || r.StatusCode() >= 300
44+
}
45+
4646
func (c *Client) Download(id string, path string) (err *APIError) {
4747
_, e := c.resty.R().
4848
SetOutput(path).

‎currency.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ func (c *Client) CurrencyConvert(req *CurrencyConvertRequest) (*CurrencyConvertR
2626
Message: e.Error(),
2727
}
2828
}
29-
if success(r) {
30-
return res, nil
29+
if c.error(r) {
30+
return nil, err
3131
}
32-
return nil, err
32+
return res, nil
3333
}

‎dns.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ func (c *Client) DNSLookup(req *DNSLookupRequest) (*DNSLookupResponse, *APIError
4848
Message: e.Error(),
4949
}
5050
}
51-
if success(r) {
52-
return res, nil
51+
if c.error(r) {
52+
return nil, err
5353
}
54-
return nil, err
54+
return res, nil
5555
}

‎email.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func (c *Client) EmailVerify(req *EmailVerifyRequest) (*EmailVerifyResponse, *AP
2727
Message: e.Error(),
2828
}
2929
}
30-
if success(r) {
31-
return res, nil
30+
if c.error(r) {
31+
return nil, err
3232
}
33-
return nil, err
33+
return res, nil
3434
}

‎image.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ func (c *Client) ImageCompress(req *ImageCompressRequest) (*ImageCompressRespons
5252
Message: e.Error(),
5353
}
5454
}
55-
if success(r) {
56-
return res, nil
55+
if c.error(r) {
56+
return nil, err
5757
}
58-
return nil, err
58+
return res, nil
5959
}
6060

6161
func (c *Client) ImageResize(req *ImageResizeRequest) (*ImageResizeResponse, *APIError) {
@@ -76,10 +76,10 @@ func (c *Client) ImageResize(req *ImageResizeRequest) (*ImageResizeResponse, *AP
7676
Message: e.Error(),
7777
}
7878
}
79-
if success(r) {
80-
return res, nil
79+
if c.error(r) {
80+
return nil, err
8181
}
82-
return nil, err
82+
return res, nil
8383
}
8484

8585
func (c *Client) ImageWatermark(req *ImageWatermarkRequest) (*ImageWatermarkResponse, *APIError) {
@@ -104,8 +104,8 @@ func (c *Client) ImageWatermark(req *ImageWatermarkRequest) (*ImageWatermarkResp
104104
Message: e.Error(),
105105
}
106106
}
107-
if success(r) {
108-
return res, nil
107+
if c.error(r) {
108+
return nil, err
109109
}
110-
return nil, err
110+
return res, nil
111111
}

‎pdf.go

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type (
3434
func (c *Client) PDFCompress(req *PDFCompressRequest) (*PDFCompressResponse, *APIError) {
3535
res := new(PDFCompressResponse)
3636
err := new(APIError)
37-
_, e := c.resty.R().
37+
r, e := c.resty.R().
3838
SetFile("file", req.File).
3939
SetResult(res).
4040
SetError(err).
@@ -44,13 +44,16 @@ func (c *Client) PDFCompress(req *PDFCompressRequest) (*PDFCompressResponse, *AP
4444
Message: e.Error(),
4545
}
4646
}
47-
return res, err
47+
if c.error(r) {
48+
return nil, err
49+
}
50+
return res, nil
4851
}
4952

5053
func (c *Client) PDFImage(req *PDFImageRequest) (*PDFImageResponse, *APIError) {
5154
res := new(PDFImageResponse)
5255
err := new(APIError)
53-
_, e := c.resty.R().
56+
r, e := c.resty.R().
5457
SetFile("file", req.File).
5558
SetFormData(map[string]string{
5659
"extract": strconv.FormatBool(req.Extract),
@@ -63,7 +66,10 @@ func (c *Client) PDFImage(req *PDFImageRequest) (*PDFImageResponse, *APIError) {
6366
Message: e.Error(),
6467
}
6568
}
66-
return res, err
69+
if c.error(r) {
70+
return nil, err
71+
}
72+
return res, nil
6773
}
6874

6975
func (c *Client) PDFSplit(req *PDFSplitRequest) (*PDFSplitResponse, *APIError) {
@@ -82,8 +88,8 @@ func (c *Client) PDFSplit(req *PDFSplitRequest) (*PDFSplitResponse, *APIError) {
8288
Message: e.Error(),
8389
}
8490
}
85-
if success(r) {
86-
return res, nil
91+
if c.error(r) {
92+
return nil, err
8793
}
88-
return nil, err
94+
return res, nil
8995
}

‎text.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ func (c *Client) TextSummary(req *TextSummaryRequest) (*TextSummaryResponse, *AP
4949
Message: e.Error(),
5050
}
5151
}
52-
if success(r) {
53-
return res, nil
52+
if c.error(r) {
53+
return nil, err
5454
}
55-
return nil, err
55+
return res, nil
5656
}
5757

5858
func (c *Client) TextSentiment(req *TextSentimentRequest) (*TextSentimentResponse, *APIError) {
@@ -68,10 +68,10 @@ func (c *Client) TextSentiment(req *TextSentimentRequest) (*TextSentimentRespons
6868
Message: e.Error(),
6969
}
7070
}
71-
if success(r) {
72-
return res, nil
71+
if c.error(r) {
72+
return nil, err
7373
}
74-
return nil, err
74+
return res, nil
7575
}
7676

7777
func (c *Client) TextSpellcheck(req *TextSpellcheckRequest) (*TextSpellcheckResponse, *APIError) {
@@ -87,8 +87,8 @@ func (c *Client) TextSpellcheck(req *TextSpellcheckRequest) (*TextSpellcheckResp
8787
Message: e.Error(),
8888
}
8989
}
90-
if success(r) {
91-
return res, nil
90+
if c.error(r) {
91+
return nil, err
9292
}
93-
return nil, err
93+
return res, nil
9494
}

‎webpage.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func (c *Client) WebpagePDF(req *WebpagePDFRequest) (*WebpagePDFResponse, *APIEr
2525
Message: e.Error(),
2626
}
2727
}
28-
if success(r) {
29-
return res, nil
28+
if c.error(r) {
29+
return nil, err
3030
}
31-
return nil, err
31+
return res, nil
3232
}

‎word.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func (c *Client) WordLookup(req *WordLookupRequest) (*WordLookupResponse, *APIEr
3535
Message: e.Error(),
3636
}
3737
}
38-
if success(r) {
39-
return res, nil
38+
if c.error(r) {
39+
return nil, err
4040
}
41-
return nil, err
41+
return res, nil
4242
}

0 commit comments

Comments
 (0)