Merge pull request #104 from WillCodeForCats/remove-device-support

Support removing devices from UI

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/__init__.py

@@ -13,6 +13,7 @@
     Platform,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
@@ -101,6 +102,53 @@ async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     await hass.config_entries.async_reload(entry.entry_id)
 
 
+async def async_remove_config_entry_device(
+    hass: HomeAssistant, config_entry: ConfigEntry, device_entry: DeviceEntry
+) -> bool:
+    """Remove a config entry from a device."""
+    solaredge_hub = hass.data[DOMAIN][config_entry.entry_id]["hub"]
+
+    known_devices = []
+
+    for inverter in solaredge_hub.inverters:
+        inverter_device_ids = {
+            dev_id[1]
+            for dev_id in inverter.device_info["identifiers"]
+            if dev_id[0] == DOMAIN
+        }
+        for dev_id in inverter_device_ids:
+            known_devices.append(dev_id)
+
+    for meter in solaredge_hub.meters:
+        meter_device_ids = {
+            dev_id[1]
+            for dev_id in meter.device_info["identifiers"]
+            if dev_id[0] == DOMAIN
+        }
+        for dev_id in meter_device_ids:
+            known_devices.append(dev_id)
+
+    for battery in solaredge_hub.batteries:
+        battery_device_ids = {
+            dev_id[1]
+            for dev_id in battery.device_info["identifiers"]
+            if dev_id[0] == DOMAIN
+        }
+        for dev_id in battery_device_ids:
+            known_devices.append(dev_id)
+
+    this_device_ids = {
+        dev_id[1] for dev_id in device_entry.identifiers if dev_id[0] == DOMAIN
+    }
+
+    for device_id in this_device_ids:
+        if device_id in known_devices:
+            _LOGGER.error(f"Failed to remove device entry: device {device_id} in use")
+            return False
+
+    return True
+
+
 class SolarEdgeCoordinator(DataUpdateCoordinator):
     def __init__(self, hass, hub, scan_interval):
         super().__init__(

custom_components/solaredge_modbus_multi/hub.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 import threading
 from collections import OrderedDict
@@ -93,7 +92,7 @@ def __init__(
         self.inverter_common = {}
         self.mmppt_common = {}
 
-        self._client = ModbusTcpClient(host=self._host, port=self._port)
+        self._client = None
 
         self.initalized = False
         self.online = False
@@ -340,19 +339,24 @@ def disconnect(self) -> None:
     async def connect(self) -> None:
         """Connect modbus client."""
         with self._lock:
+            if self._client is None:
+                self._client = ModbusTcpClient(host=self._host, port=self._port)
+
             await self._hass.async_add_executor_job(self._client.connect)
 
     def is_socket_open(self) -> bool:
         """Check modbus client connection status."""
         with self._lock:
+            if self._client is None:
+                return False
+
             return self._client.is_socket_open()
 
     async def shutdown(self) -> None:
         """Shut down the hub."""
         self.online = False
         self.disconnect()
         self._client = None
-        await asyncio.sleep(3)
 
     def read_holding_registers(self, unit, address, count):
         """Read holding registers."""