evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve deCONZ signal strings (#57140)

Browse source
This commit is contained in:
Robert Svensson 2021-10-07 12:48:27 +02:00 • committed by GitHub
parent 2ba8e1030c
commit 750dd9186e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

52
homeassistant/components/deconz/gateway.py
View file

@ -2,7 +2,7 @@
import asyncio
import async_timeout
from pydeconz import DeconzSession, errors
from pydeconz import DeconzSession, errors, group, light, sensor
from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
from homeassistant.core import callback
@ -21,10 +21,6 @@ from .const import (
DEFAULT_ALLOW_NEW_DEVICES,
DOMAIN as DECONZ_DOMAIN,
LOGGER,
NEW_GROUP,
NEW_LIGHT,
NEW_SCENE,
NEW_SENSOR,
PLATFORMS,
)
from .deconz_event import async_setup_events, async_unload_events
@ -50,6 +46,20 @@ class DeconzGateway:
self.available = True
self.ignore_state_updates = False
self.signal_reachable = f"deconz-reachable-{config_entry.entry_id}"
self.signal_new_group = f"deconz_new_group_{config_entry.entry_id}"
self.signal_new_light = f"deconz_new_light_{config_entry.entry_id}"
self.signal_new_scene = f"deconz_new_scene_{config_entry.entry_id}"
self.signal_new_sensor = f"deconz_new_sensor_{config_entry.entry_id}"
self.deconz_resource_type_to_signal_new_device = {
group.RESOURCE_TYPE: self.signal_new_group,
light.RESOURCE_TYPE: self.signal_new_light,
group.RESOURCE_TYPE_SCENE: self.signal_new_scene,
sensor.RESOURCE_TYPE: self.signal_new_sensor,
}
self.deconz_ids = {}
self.entities = {}
self.events = []
@ -92,24 +102,6 @@ class DeconzGateway:
CONF_ALLOW_NEW_DEVICES, DEFAULT_ALLOW_NEW_DEVICES
)
# Signals
@property
def signal_reachable(self) -> str:
"""Gateway specific event to signal a change in connection status."""
return f"deconz-reachable-{self.bridgeid}"
@callback
def async_signal_new_device(self, device_type) -> str:
"""Gateway specific event to signal new device."""
new_device = {
NEW_GROUP: f"deconz_new_group_{self.bridgeid}",
NEW_LIGHT: f"deconz_new_light_{self.bridgeid}",
NEW_SCENE: f"deconz_new_scene_{self.bridgeid}",
NEW_SENSOR: f"deconz_new_sensor_{self.bridgeid}",
}
return new_device[device_type]
# Callbacks
@callback
@ -121,10 +113,14 @@ class DeconzGateway:
@callback
def async_add_device_callback(
self, device_type, device=None, force: bool = False
self, resource_type, device=None, force: bool = False
) -> None:
"""Handle event of new device creation in deCONZ."""
if not force and not self.option_allow_new_devices:
if (
not force
and not self.option_allow_new_devices
or resource_type not in self.deconz_resource_type_to_signal_new_device
):
return
args = []
@ -134,7 +130,7 @@ class DeconzGateway:
async_dispatcher_send(
self.hass,
self.async_signal_new_device(device_type),
self.deconz_resource_type_to_signal_new_device[resource_type],
*args, # Don't send device if None, it would override default value in listeners
)
@ -207,7 +203,7 @@ class DeconzGateway:
deconz_ids = []
if self.option_allow_clip_sensor:
self.async_add_device_callback(NEW_SENSOR)
self.async_add_device_callback(sensor.RESOURCE_TYPE)
else:
deconz_ids += [
@ -217,7 +213,7 @@ class DeconzGateway:
]
if self.option_allow_deconz_groups:
self.async_add_device_callback(NEW_GROUP)
self.async_add_device_callback(group.RESOURCE_TYPE)
else:
deconz_ids += [group.deconz_id for group in self.api.groups.values()]