Rename _need_initialized to _is_initialized and reduce nb line in async_setup_entry

Author: Gigatrappeur

homeassistant/components/switchbot_cloud/__init__.py

@@ -12,7 +12,7 @@
 from homeassistant.components import webhook
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, CONF_WEBHOOK_ID, Platform
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import DOMAIN, ENTRY_TITLE
@@ -186,13 +186,34 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    await _initialize_webhook(hass, entry, api, coordinators_by_id)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+async def _initialize_webhook(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    api: SwitchBotAPI,
+    coordinators_by_id: dict[str, SwitchBotCoordinator],
+) -> None:
+    """Initialize webhook if needed."""
     if any(
         coordinator.update_by_webhook() for coordinator in coordinators_by_id.values()
     ):
-        # Need webhook
+        # Need webhook because there coordinator updated by this
         if CONF_WEBHOOK_ID not in entry.data or entry.unique_id is None:
             new_data = entry.data.copy()
             if CONF_WEBHOOK_ID not in new_data:
+                # create new id and new conf
                 new_data[CONF_WEBHOOK_ID] = webhook.async_generate_id()
 
             hass.config_entries.async_update_entry(
@@ -211,14 +232,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                 DOMAIN,
                 webhook_name,
                 entry.data[CONF_WEBHOOK_ID],
-                create_handle_webhook(coordinators_by_id),
+                _create_handle_webhook(coordinators_by_id),
             )
 
         webhook_url = webhook.async_generate_url(
             hass,
             entry.data[CONF_WEBHOOK_ID],
         )
-        # check if webhook is configured
+
+        # check if webhook is configured in switchbot cloud
         check_webhook_result = None
         with contextlib.suppress(Exception):
             check_webhook_result = await api.get_webook_configuration()
@@ -244,23 +266,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             # call api for register webhookurl
             await api.setup_webhook(webhook_url)
 
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
-
 
-def create_handle_webhook(
+def _create_handle_webhook(
     coordinators_by_id: dict[str, SwitchBotCoordinator],
 ) -> Callable[[HomeAssistant, str, web.Request], Awaitable[None]]:
     """Create a webhook handler."""
 
-    async def internal_handle_webhook(
+    async def _internal_handle_webhook(
         hass: HomeAssistant, webhook_id: str, request: web.Request
     ) -> None:
         """Handle webhook callback."""
@@ -312,4 +324,4 @@ async def internal_handle_webhook(
 
         coordinators_by_id[deviceMac].async_set_updated_data(data["context"])
 
-    return internal_handle_webhook
+    return _internal_handle_webhook

homeassistant/components/switchbot_cloud/coordinator.py

@@ -44,18 +44,18 @@ def __init__(
         self._device_id = device.device_id
         self._should_poll = not update_by_webhook and not isinstance(device, Remote)
         self._update_by_webhook = update_by_webhook
-        self._need_initialized = update_by_webhook
+        self._is_initialized = not update_by_webhook
 
     def update_by_webhook(self) -> bool:
         """Return update_by_webhook value."""
         return self._update_by_webhook
 
     async def _async_update_data(self) -> Status:
         """Fetch data from API endpoint."""
-        if not self._should_poll and not self._need_initialized:
+        if not self._should_poll and self._is_initialized:
             return None
 
-        self._need_initialized = False
+        self._is_initialized = True
         try:
             _LOGGER.debug("Refreshing %s", self._device_id)
             async with timeout(10):