Fix remove battery note

Author: andrew-codechimp

custom_components/battery_notes/__init__.py

@@ -175,35 +175,34 @@ async def async_remove_entry(hass: HomeAssistant, config_entry: BatteryNotesConf
     # Remove any issues raised
     ir.async_delete_issue(hass, DOMAIN, f"missing_device_{config_entry.entry_id}")
 
-    if not config_entry.runtime_data.coordinator or not config_entry.runtime_data.coordinator.device_id:
-        return
-
-    data = {ATTR_REMOVE: True}
+    store = await async_get_registry(hass)
+    coordinator = BatteryNotesCoordinator(hass, config_entry)
 
-    config_entry.runtime_data.coordinator.async_update_device_config(
-        device_id=config_entry.runtime_data.coordinator.device_id, data=data
-    )
+    if coordinator.source_entity_id:
+        store.async_delete_entity(coordinator.source_entity_id)
+    else:
+        store.async_delete_device(coordinator.device_id)
 
-    _LOGGER.debug("Removed Device %s", config_entry.runtime_data.coordinator.device_id)
+    _LOGGER.debug("Removed battery note %s", config_entry.entry_id)
 
     # Unhide the battery
     entity_registry = er.async_get(hass)
-    if not config_entry.runtime_data.coordinator.wrapped_battery:
+    if not coordinator.wrapped_battery:
         return
 
     if not (
         wrapped_battery_entity_entry := entity_registry.async_get(
-            config_entry.runtime_data.coordinator.wrapped_battery.entity_id
+            coordinator.wrapped_battery.entity_id
         )
     ):
         return
 
     if wrapped_battery_entity_entry.hidden_by == er.RegistryEntryHider.INTEGRATION:
         entity_registry.async_update_entity(
-            config_entry.runtime_data.coordinator.wrapped_battery.entity_id, hidden_by=None
+            coordinator.wrapped_battery.entity_id, hidden_by=None
         )
         _LOGGER.debug(
-            "Unhidden Original Battery for device%s", config_entry.runtime_data.coordinator.device_id
+            "Unhidden Original Battery for device%s", coordinator.device_id
         )
 
 

custom_components/battery_notes/config_flow.py

@@ -249,16 +249,9 @@ async def async_step_entity(
                 if entity_entry.device_id:
                     self.data[CONF_DEVICE_ID] = entity_entry.device_id
 
-                    if (
-                        DOMAIN in self.hass.data
-                        and DATA_LIBRARY_UPDATER in self.hass.data[DOMAIN]
-                    ):
-                        library_updater: LibraryUpdater = self.hass.data[DOMAIN][
-                            DATA_LIBRARY_UPDATER
-                        ]
-
-                        if await library_updater.time_to_update_library(1):
-                            await library_updater.get_library_updates(dt_util.utcnow())
+                    library_updater = LibraryUpdater(self.hass)
+                    if await library_updater.time_to_update_library(1):
+                        await library_updater.get_library_updates(dt_util.utcnow())
 
                     device_registry = dr.async_get(self.hass)
                     device_entry = device_registry.async_get(entity_entry.device_id)

custom_components/battery_notes/coordinator.py

@@ -146,8 +146,9 @@ def __init__(
             self.config_entry.data.get(CONF_BATTERY_LOW_THRESHOLD, 0)
         )
 
-        if self.battery_low_threshold == 0:
-            self.battery_low_threshold = self.config_entry.runtime_data.domain_config.default_battery_low_threshold
+        if hasattr(self.config_entry, "runtime_data"):
+            if self.battery_low_threshold == 0:
+                self.battery_low_threshold = self.config_entry.runtime_data.domain_config.default_battery_low_threshold
 
         self.battery_low_template = self.config_entry.data.get(
             CONF_BATTERY_LOW_TEMPLATE
@@ -594,6 +595,9 @@ def battery_type_and_quantity(self) -> str:
     @property
     def last_replaced(self) -> datetime | None:
         """Get the last replaced datetime."""
+        if not hasattr(self.config_entry, "runtime_data"):
+            return None
+
         if self.source_entity_id:
             entry = self.config_entry.runtime_data.store.async_get_entity(self.source_entity_id)
         else:
@@ -610,6 +614,9 @@ def last_replaced(self) -> datetime | None:
     @last_replaced.setter
     def last_replaced(self, value: datetime):
         """Set the last replaced datetime and store it."""
+        if not hasattr(self.config_entry, "runtime_data"):
+            return
+
         entry = {LAST_REPLACED: value}
 
         if self.source_entity_id:
@@ -621,6 +628,9 @@ def last_replaced(self, value: datetime):
     def last_reported(self) -> datetime | None:
         """Get the last reported datetime."""
 
+        if not hasattr(self.config_entry, "runtime_data"):
+            return None
+
         if self.source_entity_id:
             entry = self.config_entry.runtime_data.store.async_get_entity(self.source_entity_id)
         else:
@@ -639,6 +649,10 @@ def last_reported(self) -> datetime | None:
     @last_reported.setter
     def last_reported(self, value):
         """Set the last reported datetime and store it."""
+
+        if not hasattr(self.config_entry, "runtime_data"):
+            return
+
         entry = {LAST_REPORTED: value}
 
         if self.source_entity_id:
@@ -650,6 +664,8 @@ def last_reported(self, value):
     @property
     def last_reported_level(self) -> float | None:
         """Get the last reported level."""
+        if not hasattr(self.config_entry, "runtime_data"):
+            return None
 
         if self.source_entity_id:
             entry = self.config_entry.runtime_data.store.async_get_entity(self.source_entity_id)
@@ -715,6 +731,9 @@ async def _async_update_data(self):
     def async_update_device_config(self, device_id: str, data: dict):
         """Conditional create, update or remove device from store."""
 
+        if not hasattr(self.config_entry, "runtime_data"):
+            return
+
         if ATTR_REMOVE in data:
             self.config_entry.runtime_data.store.async_delete_device(device_id)
         elif self.config_entry.runtime_data.store.async_get_device(device_id):
@@ -725,6 +744,9 @@ def async_update_device_config(self, device_id: str, data: dict):
     def async_update_entity_config(self, entity_id: str, data: dict):
         """Conditional create, update or remove entity from store."""
 
+        if not hasattr(self.config_entry, "runtime_data"):
+            return
+
         if ATTR_REMOVE in data:
             self.config_entry.runtime_data.store.async_delete_entity(entity_id)
         elif self.config_entry.runtime_data.store.async_get_entity(entity_id):