Move async_add_entities back to event loop for tplink component (#42454)

This commit is contained in:
Angelo Gagliano authored and GitHub committed 2020-10-28 09:51:53 +01:00
1 parent e21e28e49f
commit d42bdcfc2a
4 files changed
+24 -13

No files matched your search

+5 -7
View File
@@ -131,7 +131,7 @@ def get_static_devices(config_data) -> SmartDevices:
return SmartDevices(lights, switches)
def add_available_devices(hass, device_type, device_class, async_add_entities):
def add_available_devices(hass, device_type, device_class):
"""Get sysinfo for all devices."""
devices = hass.data[TPLINK_DOMAIN][device_type]
@@ -140,20 +140,18 @@ def add_available_devices(hass, device_type, device_class, async_add_entities):
devices = hass.data[TPLINK_DOMAIN][f"{device_type}_remaining"]
entities_ready = []
entities_unavailable = []
devices_unavailable = []
for device in devices:
try:
device.get_sysinfo()
entities_ready.append(device_class(device))
except SmartDeviceException as ex:
entities_unavailable.append(device)
devices_unavailable.append(device)
_LOGGER.warning(
"Unable to communicate with device %s: %s",
device.host,
ex,
)
hass.data[TPLINK_DOMAIN][f"{device_type}_remaining"] = entities_unavailable
if entities_ready:
async_add_entities(entities_ready, update_before_add=True)
hass.data[TPLINK_DOMAIN][f"{device_type}_remaining"] = devices_unavailable
return entities_ready
+5 -2
View File
@@ -61,10 +61,13 @@ SLEEP_TIME = 2
async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
"""Set up lights."""
await hass.async_add_executor_job(
add_available_devices, hass, CONF_LIGHT, TPLinkSmartBulb, async_add_entities
entities = await hass.async_add_executor_job(
add_available_devices, hass, CONF_LIGHT, TPLinkSmartBulb
)
if entities:
async_add_entities(entities, update_before_add=True)
if hass.data[TPLINK_DOMAIN][f"{CONF_LIGHT}_remaining"]:
raise PlatformNotReady
+5 -2
View File
@@ -31,10 +31,13 @@ SLEEP_TIME = 2
async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
"""Set up switches."""
await hass.async_add_executor_job(
add_available_devices, hass, CONF_SWITCH, SmartPlugSwitch, async_add_entities
entities = await hass.async_add_executor_job(
add_available_devices, hass, CONF_SWITCH, SmartPlugSwitch
)
if entities:
async_add_entities(entities, update_before_add=True)
if hass.data[TPLINK_DOMAIN][f"{CONF_SWITCH}_remaining"]:
raise PlatformNotReady