From 7afac327af365967b53051f7d26351e60334373e Mon Sep 17 00:00:00 2001
From: Collin Guarino <collin.guarino@gmail.com>
Date: Thu, 28 Jan 2016 00:23:10 -0500
Subject: Refactored GetAllLights to work well with GetLight

---
 lights.go | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'lights.go')

diff --git a/lights.go b/lights.go
index 7f60a52..7c0fda2 100644
--- a/lights.go
+++ b/lights.go
@@ -1,13 +1,13 @@
 package hue
 
 import (
-    "log"
     "fmt"
     "os"
     "net/http"
     "io/ioutil"
     "encoding/json"
     "strings"
+    "errors"
 )
 
 type Light struct {
@@ -36,15 +36,15 @@ type Light struct {
 //http://192.168.1.128/api/319b36233bd2328f3e40731b23479207/lights/
 
 // GetAllLights retreives the state of all lights that the bridge is aware of.
-func GetAllLights(bridge *Bridge) {
+func GetAllLights(bridge *Bridge) []Light {
     // Loop through all light indicies to see if they exist
     // and parse their values. Supports 100 lights.
     var lights []Light
     for index := 1; index < 101; index++ {
-        response, error := http.Get(
+        response, err := http.Get(
             fmt.Sprintf("http://%s/api/%s/lights/%d", bridge.IPAddress, bridge.Username, index))
-        if error != nil {
-            trace("", error)
+        if err != nil {
+            trace("", err)
             os.Exit(1)
         } else if response.StatusCode != 200 {
             trace(fmt.Sprintf("Bridge status error %d", response.StatusCode), nil)
@@ -52,28 +52,37 @@ func GetAllLights(bridge *Bridge) {
         }
 
         // Read the response
-        body, error := ioutil.ReadAll(response.Body)
+        body, err := ioutil.ReadAll(response.Body)
         defer response.Body.Close()
-        if error != nil {
-            if strings.Contains(string(body), "not available") {
-                // Handle end of searchable lights
-                fmt.Printf("\n\n%d lights found.\n\n", index)
-                break
-            } else {
-                // Other error found while parsing
-                trace("", error)
-                os.Exit(1)
-            }
+        if err != nil {
+            trace("", err)
+            os.Exit(1)
+        }
+        if strings.Contains(string(body), "not available") {
+            // Handle end of searchable lights
+            fmt.Printf("\n\n%d lights found.\n\n", index)
+            break
         }
 
         // Parse and load the response into the light array
         data := Light{}
-        error = json.Unmarshal(body, &data)
-        if error != nil {
-            trace("", error)
+        err = json.Unmarshal(body, &data)
+        if err != nil {
+            trace("", err)
             os.Exit(1)
         }
         lights = append(lights, data)
     }
     return lights
 }
+
+// GetLight will return a light struct containing data on a given name.
+func GetLight(bridge *Bridge, name string) (Light, error) {
+    lights := GetAllLights(bridge)
+    for index := 0; index < len(lights); index++ {
+        if lights[index].Name == name {
+            return lights[index], nil
+        }
+    }
+    return Light{}, errors.New("Light not found.")
+}
-- 
cgit v1.2.3