Remove entities that are no longer supported by a device or client.

zachcheatham · Feb 12, 2023 · 7eebaac · 7eebaac
1 parent ae8f633
commit 7eebaac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/custom_components/omada/__init__.py b/custom_components/omada/__init__.py
@@ -31,10 +31,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     omada_controller = OmadaController(hass, entry)
     await omada_controller.async_setup()
 
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = omada_controller
 
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
     return True
 
 

diff --git a/custom_components/omada/controller.py b/custom_components/omada/controller.py
@@ -254,7 +254,8 @@ def restore_cleanup_platform_entities(
                         if not mac in self.entities[description.domain][description.key]:
                             entity = platform_entity(mac, self, description)
                             entities.append(entity)
-                    elif mac not in stored_macs or not description.allowed_fn(self, mac):
+                    elif (mac not in stored_macs or not description.allowed_fn(self, mac)
+                          or not description.supported_fn(self, mac)):
                         er.async_remove(entry.entity_id)
 
         async_add_entities(entities)