Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix iCloud init while pending (#32750) 

* Fix iCloud init while pending

Continue if device is pending while setup
Create devices and fetch 15s if pending, otherwise determine interval to fetch.

* Add retried_fetch guard
pull/32932/head
Quentame 2020-03-17 18:16:58 +01:00 committed by Paulus Schoutsen
parent d196fd136d
commit 67a721d39b
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/icloud/account.py
View File

@ -97,6 +97,7 @@ class IcloudAccount:
self._owner_fullname = None self._owner_fullname = None
self._family_members_fullname = {} self._family_members_fullname = {}
self._devices = {} self._devices = {}
self._retried_fetch = False
self.listeners = [] self.listeners = []
@ -122,10 +123,6 @@ class IcloudAccount:
_LOGGER.error("No iCloud device found") _LOGGER.error("No iCloud device found")
raise ConfigEntryNotReady raise ConfigEntryNotReady
if DEVICE_STATUS_CODES.get(list(api_devices)[0][DEVICE_STATUS]) == "pending":
_LOGGER.warning("Pending devices, trying again ...")
raise ConfigEntryNotReady
self._owner_fullname = f"{user_info['firstName']} {user_info['lastName']}" self._owner_fullname = f"{user_info['firstName']} {user_info['lastName']}"
self._family_members_fullname = {} self._family_members_fullname = {}
@ -157,28 +154,15 @@ class IcloudAccount:
) )
return return
if DEVICE_STATUS_CODES.get(list(api_devices)[0][DEVICE_STATUS]) == "pending":
_LOGGER.warning("Pending devices, trying again in 15s")
self._fetch_interval = 0.25
dispatcher_send(self.hass, self.signal_device_update)
track_point_in_utc_time(
self.hass,
self.keep_alive,
utcnow() + timedelta(minutes=self._fetch_interval),
)
return
# Gets devices infos # Gets devices infos
new_device = False new_device = False
for device in api_devices: for device in api_devices:
status = device.status(DEVICE_STATUS_SET) status = device.status(DEVICE_STATUS_SET)
device_id = status[DEVICE_ID] device_id = status[DEVICE_ID]
device_name = status[DEVICE_NAME] device_name = status[DEVICE_NAME]
device_status = DEVICE_STATUS_CODES.get(status[DEVICE_STATUS], "error")
if ( if (
device_status == "pending" status[DEVICE_BATTERY_STATUS] == "Unknown"
or status[DEVICE_BATTERY_STATUS] == "Unknown"
or status.get(DEVICE_BATTERY_LEVEL) is None or status.get(DEVICE_BATTERY_LEVEL) is None
): ):
continue continue
@ -198,7 +182,16 @@ class IcloudAccount:
self._devices[device_id].update(status) self._devices[device_id].update(status)
new_device = True new_device = True
if (
DEVICE_STATUS_CODES.get(list(api_devices)[0][DEVICE_STATUS]) == "pending"
and not self._retried_fetch
):
_LOGGER.warning("Pending devices, trying again in 15s")
self._fetch_interval = 0.25
self._retried_fetch = True
else:
self._fetch_interval = self._determine_interval() self._fetch_interval = self._determine_interval()
self._retried_fetch = False
dispatcher_send(self.hass, self.signal_device_update) dispatcher_send(self.hass, self.signal_device_update)
if new_device: if new_device: