From e373e7e273c47f9e64f0db37a1ac68642e06a776 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Sun, 5 Apr 2020 18:54:40 -0500
Subject: [PATCH] add error helpers

---
 client.go | 14 ++++++++++++++
 lights.go | 30 +++++-------------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/client.go b/client.go
index c18d0aa..19c00fd 100644
--- a/client.go
+++ b/client.go
@@ -114,6 +114,20 @@ func NewResponse(r *http.Response) (*Response, error) {
 	return &resp, nil
 }
 
+func (r *Response) IsError() bool {
+	return r.StatusCode > 299
+}
+
+func (r *Response) GetLifxError() (err error) {
+	var (
+		s *LifxResponse
+	)
+	if err = json.NewDecoder(r.Body).Decode(&s); err != nil {
+		return nil
+	}
+	return errors.New(s.Error)
+}
+
 func (c *Client) NewRequest(method, url string, body io.Reader) (req *http.Request, err error) {
 	req, err = http.NewRequest(method, url, body)
 	if err != nil {
diff --git a/lights.go b/lights.go
index 7a09606..1271c2e 100644
--- a/lights.go
+++ b/lights.go
@@ -3,7 +3,6 @@ package lifx
 import (
 	//"crypto/tls"
 	"encoding/json"
-	"errors"
 	"net/http"
 	"time"
 )
@@ -89,25 +88,6 @@ type (
 	}
 )
 
-func NewApiError(resp *Response) error {
-	var (
-		s   *LifxResponse
-		err error
-	)
-	if err = json.NewDecoder(resp.Body).Decode(&s); err != nil {
-		return err
-	}
-	return errors.New(s.Error)
-}
-
-func IsApiError(resp *Response) bool {
-	return resp.StatusCode > 299
-}
-
-func (s Status) Success() bool {
-	return s == OK
-}
-
 func (c *Client) SetState(selector string, state State) (*LifxResponse, error) {
 	var (
 		err  error
@@ -120,8 +100,8 @@ func (c *Client) SetState(selector string, state State) (*LifxResponse, error) {
 	}
 	defer resp.Body.Close()
 
-	if IsApiError(resp) {
-		return nil, NewApiError(resp)
+	if resp.IsError() {
+		return nil, resp.GetLifxError()
 	}
 
 	if state.Fast && resp.StatusCode == http.StatusAccepted {
@@ -190,8 +170,8 @@ func (c *Client) Toggle(selector string, duration float64) (*LifxResponse, error
 	}
 	defer resp.Body.Close()
 
-	if IsApiError(resp) {
-		return nil, NewApiError(resp)
+	if resp.IsError() {
+		return nil, resp.GetLifxError()
 	}
 
 	if err = json.NewDecoder(resp.Body).Decode(&s); err != nil {
@@ -214,7 +194,7 @@ func (c *Client) ListLights(selector string) ([]Light, error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode > 299 {
-		return nil, NewApiError(resp)
+		return nil, resp.GetLifxError()
 	}
 
 	if err = json.NewDecoder(resp.Body).Decode(&s); err != nil {