2 Commits
Author SHA1 Message Date
gisle bf903c1d71 fix crash in hue2 driver.
continuous-integration/drone/push Build is passing
2023-08-31 21:19:53 +02:00
gisle 19eb205ee3 try again.
continuous-integration/drone/push Build is passing
2023-08-31 20:37:54 +02:00
2 changed files with 43 additions and 2 deletions
+9 -2
View File
@@ -252,6 +252,9 @@ func (b *Bridge) MakeCongruent(ctx context.Context) (int, error) {
updates := make(map[string]ResourceUpdate)
for _, device := range b.devices {
resource := b.resources[device.InternalID]
if resource == nil {
continue
}
// Update device
if resource.Metadata.Name != device.Name {
@@ -624,9 +627,13 @@ func (b *Bridge) Forget(ctx context.Context, device models.Device) error {
b.mu.Lock()
resource := b.resources[device.InternalID]
b.mu.Unlock()
if resource == nil || resource.LegacyID == "" {
if resource == nil {
return errors.New("resource not found")
}
return b.client.legacyDelete(ctx, resource.LegacyID, nil)
return b.client.DeleteResource(ctx, ResourceLink{
ID: device.InternalID,
Kind: "device",
})
}
+34
View File
@@ -92,6 +92,10 @@ func (c *Client) UpdateResource(ctx context.Context, link ResourceLink, update R
return c.put(ctx, link.Path(), update, nil)
}
func (c *Client) DeleteResource(ctx context.Context, link ResourceLink) error {
return c.delete(ctx, link.Path(), nil)
}
func (c *Client) LegacyDiscover(ctx context.Context, kind string) error {
return c.legacyPost(ctx, kind, nil, nil)
}
@@ -268,6 +272,36 @@ func (c *Client) post(ctx context.Context, path string, body interface{}, target
return json.NewDecoder(res.Body).Decode(&target)
}
func (c *Client) delete(ctx context.Context, path string, target interface{}) error {
select {
case <-ctx.Done():
return ctx.Err()
case <-c.ch:
defer func() {
c.ch <- struct{}{}
}()
}
req, err := http.NewRequest("PUT", fmt.Sprintf("https://%s/%s", c.host, path), nil)
if err != nil {
return err
}
req.Header.Set("hue-application-key", c.token)
res, err := httpClient.Do(req.WithContext(ctx))
if err != nil {
return err
}
defer res.Body.Close()
if target == nil {
return nil
}
return json.NewDecoder(res.Body).Decode(&target)
}
func (c *Client) legacyPost(ctx context.Context, resource string, body interface{}, target interface{}) error {
select {
case <-ctx.Done():