m/hacs-oasis_mini
1
0
Fork 0
mirror of https://github.com/natekspencer/hacs-oasis_mini.git synced 2025-12-06 18:44:14 -05:00
Code Wiki Activity

Update coordinator to not fail if no devices have been initialized

Browse Source
This commit is contained in:
Nathan Spencer
2025-11-24 20:48:46 +00:00
parent e6e84f8984
commit e4ccee0698
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
custom_components/oasis_mini/coordinator.py
View File

@@ -129,29 +129,18 @@ class OasisDeviceCoordinator(DataUpdateCoordinator[list[OasisDevice]]):
except Exception: except Exception:
_LOGGER.exception("Error fetching playlists from cloud") _LOGGER.exception("Error fetching playlists from cloud")
any_success = False
for device in devices: for device in devices:
try: try:
ready = await self.mqtt_client.wait_until_ready( ready = await self.mqtt_client.wait_until_ready(
device, request_status=True device, request_status=True
) )
if not ready: if not ready:
_LOGGER.warning( _LOGGER.debug(
"Timeout waiting for Oasis device %s to be ready", "Oasis device %s not ready yet; will retry on next update",
device.serial_number, device.serial_number,
) )
continue continue
mac = await device.async_get_mac_address()
if not mac:
_LOGGER.warning(
"Could not get MAC address for Oasis device %s",
device.serial_number,
)
continue
any_success = True
device.schedule_track_refresh() device.schedule_track_refresh()
except Exception: except Exception:
@@ -159,17 +148,7 @@ class OasisDeviceCoordinator(DataUpdateCoordinator[list[OasisDevice]]):
"Error preparing Oasis device %s", device.serial_number "Error preparing Oasis device %s", device.serial_number
) )
if any_success:
self.attempt = 0 self.attempt = 0
else:
if self.attempt > 2 or not self.data:
raise UpdateFailed(
"Couldn't read from any Oasis device "
f"after {self.attempt} attempts"
)
except UpdateFailed:
raise
except Exception as ex: except Exception as ex:
if self.attempt > 2 or not (devices or self.data): if self.attempt > 2 or not (devices or self.data):
raise UpdateFailed( raise UpdateFailed(

3
custom_components/oasis_mini/pyoasiscontrol/clients/mqtt_client.py
View File

@@ -327,7 +327,6 @@ class OasisMqttClient(OasisClientProtocol):
# Wait for initialization # Wait for initialization
try: try:
await asyncio.wait_for(is_initialized_event.wait(), timeout=timeout) await asyncio.wait_for(is_initialized_event.wait(), timeout=timeout)
return True
except asyncio.TimeoutError: except asyncio.TimeoutError:
_LOGGER.debug( _LOGGER.debug(
"Timeout (%.1fs) waiting for initialization from %s", "Timeout (%.1fs) waiting for initialization from %s",
@@ -335,6 +334,8 @@ class OasisMqttClient(OasisClientProtocol):
serial, serial,
) )
return False return False
else:
return True
async def async_get_mac_address(self, device: OasisDevice) -> str | None: async def async_get_mac_address(self, device: OasisDevice) -> str | None:
""" """