public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup

This commit is contained in:
David Newhall II 2019-01-26 13:00:15 -08:00
parent 8659adfcb2
commit 7ac3b0e1f3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/unifi/unifi.go
View File

@ -33,7 +33,7 @@ func (u *Unifi) GetClients() (*Clients, error) {
// GetDevices returns a response full of devices' data from the Unifi Controller. // GetDevices returns a response full of devices' data from the Unifi Controller.
func (u *Unifi) GetDevices() (*Devices, error) { func (u *Unifi) GetDevices() (*Devices, error) {
var parsed struct { var response struct {
Data []json.RawMessage `json:"data"` Data []json.RawMessage `json:"data"`
} }
req, err := u.UniReq(DevicePath, "") req, err := u.UniReq(DevicePath, "")
@ -49,18 +49,17 @@ func (u *Unifi) GetDevices() (*Devices, error) {
}() }()
if body, err := ioutil.ReadAll(resp.Body); err != nil { if body, err := ioutil.ReadAll(resp.Body); err != nil {
return nil, errors.Wrap(err, "ioutil.ReadAll(resp.Body)") return nil, errors.Wrap(err, "ioutil.ReadAll(resp.Body)")
} else if err = json.Unmarshal(body, &parsed); err != nil { } else if err = json.Unmarshal(body, &response); err != nil {
return nil, errors.Wrap(err, "json.Unmarshal([]json.RawMessage)") return nil, errors.Wrap(err, "json.Unmarshal([]json.RawMessage)")
} }
return u.parseDevices(parsed.Data), nil return u.parseDevices(response.Data), nil
} }
// parseDevices parses the raw JSON from the Unifi Controller into device structures. // parseDevices parses the raw JSON from the Unifi Controller into device structures.
func (u *Unifi) parseDevices(data []json.RawMessage) *Devices { func (u *Unifi) parseDevices(data []json.RawMessage) *Devices {
devices := new(Devices) devices := new(Devices)
// Loop each item in the raw JSON message, detect its type and unmarshal it.
for i, r := range data { for i, r := range data {
// Unamrshal into a map and check "type" // Loop each item in the raw JSON message, detect its type and unmarshal it.
var obj map[string]interface{} var obj map[string]interface{}
if err := json.Unmarshal(r, &obj); err != nil { if err := json.Unmarshal(r, &obj); err != nil {
u.eLogf("%d: json.Unmarshal(interfce{}): %v", i, err) u.eLogf("%d: json.Unmarshal(interfce{}): %v", i, err)