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

Prevent firmware update error when internet blocked for Reolink camera (#91738)

Browse Source 
* Prevent firmware update error when internet blocked

* fix styling

* switch back to async_config_entry_first_refresh

* fix still raising when starting

* missing return

* Catch CancelledError
This commit is contained in:
starkillerOG 2023-05-24 15:16:35 +02:00 committed by GitHub
parent e97b331942
commit 16780bf4c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/reolink/__init__.py
View File

@ -75,6 +75,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, host.stop) hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, host.stop)
) )
starting = True
async def async_device_config_update() -> None: async def async_device_config_update() -> None:
"""Update the host state cache and renew the ONVIF-subscription.""" """Update the host state cache and renew the ONVIF-subscription."""
async with async_timeout.timeout(host.api.timeout): async with async_timeout.timeout(host.api.timeout):
@ -96,9 +98,19 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
async with async_timeout.timeout(host.api.timeout): async with async_timeout.timeout(host.api.timeout):
try: try:
return await host.api.check_new_firmware() return await host.api.check_new_firmware()
except ReolinkError as err: except (ReolinkError, asyncio.exceptions.CancelledError) as err:
if starting:
_LOGGER.debug(
"Error checking Reolink firmware update at startup "
"from %s, possibly internet access is blocked",
host.api.nvr_name,
)
return False
raise UpdateFailed( raise UpdateFailed(
f"Error checking Reolink firmware update {host.api.nvr_name}" f"Error checking Reolink firmware update from {host.api.nvr_name}, "
"if the camera is blocked from accessing the internet, "
"disable the update entity"
) from err ) from err
device_coordinator = DataUpdateCoordinator( device_coordinator = DataUpdateCoordinator(
@ -120,7 +132,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
# If camera WAN blocked, firmware check fails, do not prevent setup # If camera WAN blocked, firmware check fails, do not prevent setup
await asyncio.gather( await asyncio.gather(
device_coordinator.async_config_entry_first_refresh(), device_coordinator.async_config_entry_first_refresh(),
firmware_coordinator.async_refresh(), firmware_coordinator.async_config_entry_first_refresh(),
) )
except ConfigEntryNotReady: except ConfigEntryNotReady:
await host.stop() await host.stop()
@ -138,6 +150,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
config_entry.add_update_listener(entry_update_listener) config_entry.add_update_listener(entry_update_listener)
) )
starting = False
return True return True