jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix exception (#21571)

Browse Source
This commit is contained in:
David F. Mulcahey 2019-03-01 20:15:36 -05:00 committed by Charles Garwood
parent b8ec74cc15
commit cd6c923123
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homeassistant/components/zha/api.py
View File

@ -82,19 +82,23 @@ async def websocket_get_devices(hass, connection, msg):
"""Get ZHA devices."""
zha_gateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
ha_device_registry = await async_get_registry(hass)
devices = [
{
**device.device_info,
'user_given_name': ha_device_registry.async_get_device(
{(DOMAIN, str(device.ieee))}, set()).name_by_user,
'device_reg_id': ha_device_registry.async_get_device(
{(DOMAIN, str(device.ieee))}, set()).id,
'entities': [{
'entity_id': entity_ref.reference_id,
NAME: entity_ref.device_info[NAME]
} for entity_ref in zha_gateway.device_registry[device.ieee]]
} for device in zha_gateway.devices.values()
]
devices = []
for device in zha_gateway.devices.values():
ret_device = {}
ret_device.update(device.device_info)
ret_device['entities'] = [{
'entity_id': entity_ref.reference_id,
NAME: entity_ref.device_info[NAME]
} for entity_ref in zha_gateway.device_registry[device.ieee]]
reg_device = ha_device_registry.async_get_device(
{(DOMAIN, str(device.ieee))}, set())
if reg_device is not None:
ret_device['user_given_name'] = reg_device.name_by_user
ret_device['device_reg_id'] = reg_device.id
devices.append(ret_device)
connection.send_result(msg[ID], devices)