aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollin Guarino <collin.guarino@gmail.com>2016-02-28 11:43:09 -0500
committerCollin Guarino <collin.guarino@gmail.com>2016-02-28 11:43:09 -0500
commit9130e1112c75a7199f831c9a7e53f1987dfaa103 (patch)
tree5b003c2e56cbc0b85366f05a64d015ec4f8ffc88
parentd32ef65eeedf6236bc007cbd1e8c874087167eaa (diff)
Implemented Bridge.FindNewLights func.
-rw-r--r--bridge.go44
-rw-r--r--light_test.go6
2 files changed, 40 insertions, 10 deletions
diff --git a/bridge.go b/bridge.go
index 8b7df9f..c5cad71 100644
--- a/bridge.go
+++ b/bridge.go
@@ -89,16 +89,20 @@ func (bridge *Bridge) Put(path string, params interface{}) ([]byte, io.Reader, e
}
// bridge.Post sends an http POST to the bridge with
-// a body formatted with parameters (in a generic interface)
+// a body formatted with parameters (in a generic interface).
+// If `params` is nil then it will send an empty body with the post request.
func (bridge *Bridge) Post(path string, params interface{}) ([]byte, io.Reader, error) {
- // Add the params to the request
- request, err := json.Marshal(params)
- if err != nil {
- err = errors.New("Error: Unable to marshal request from bridge http POST")
- log.Println(err)
- return []byte{}, nil, err
- }
-
+ // Add the params to the request or allow an empty body
+ request := []byte{}
+ if params != nil {
+ reqBody, err := json.Marshal(params)
+ if err != nil {
+ err = errors.New("Error: Unable to add POST body parameters due to json marshal error.")
+ log.Println(err)
+ return []byte{}, nil, err
+ }
+ request = reqBody
+ }
// Send the request and handle the response
uri := fmt.Sprintf("http://" + bridge.IPAddress + path)
resp, err := http.Post(uri, "text/json", bytes.NewReader(request))
@@ -107,7 +111,7 @@ func (bridge *Bridge) Post(path string, params interface{}) ([]byte, io.Reader,
log.Println(err)
return []byte{}, nil, err
}
- return HandleResponse(resp)
+ return HandleResponse(resp)
}
// Bridge.Delete sends an http DELETE to the bridge
@@ -305,6 +309,26 @@ func (bridge *Bridge) GetLightByIndex(index int) (Light, error) {
return light, nil
}
+// Bridge.FindNewLights makes the bridge search the zigbee spectrum for
+// lights in the area and will add them to the list of lights available.
+// If successful these new lights can be used by `Bridge.GetAllLights`
+//
+// Notes from Philips Hue API documentation:
+// The bridge will search for 1 minute and will add a maximum of 15 new
+// lights. To add further lights, the command needs to be sent again after
+// the search has completed. If a search is already active, it will be
+// aborted and a new search will start.
+// http://www.developers.meethue.com/documentation/lights-api#13_search_for_new_lights
+func (bridge *Bridge) FindNewLights() error {
+ uri := fmt.Sprintf("/api/%s/lights", bridge.Username)
+ _, _, err := bridge.Post(uri, nil)
+ if err != nil {
+ log.Println(err)
+ return err
+ }
+ return nil
+}
+
// GetLight returns a light struct containing data on a given name.
func (bridge *Bridge) GetLightByName(name string) (Light, error) {
lights, _ := bridge.GetAllLights()
diff --git a/light_test.go b/light_test.go
index 51f761f..fb8eb4c 100644
--- a/light_test.go
+++ b/light_test.go
@@ -57,3 +57,9 @@ func TestSetLightState(t *testing.T) {
// _ := selectedLight.Delete()
}
+
+func TestFindNewLights(t *testing.T) {
+ bridge, _ := NewBridge("192.168.1.128")
+ bridge.Login("427de8bd6d49f149c8398e4fc08f")
+ bridge.FindNewLights()
+}