Lots of changes and modernization. WIP

custom_components/browser_mod/sensor.py

@@ -1,42 +1,48 @@
-from datetime import datetime
+from homeassistant.components.sensor import SensorEntity
 
-from homeassistant.const import STATE_UNAVAILABLE
-
-from .helpers import setup_platform, BrowserModEntity
-
-PLATFORM = "sensor"
+from .const import DOMAIN, DATA_ADDERS
+from .helpers import BrowserModEntity2
 
 
-async def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
-    return setup_platform(hass, config, async_add_devices, PLATFORM, BrowserModSensor)
-
+async def async_setup_platform(hass, config_entry, async_add_entities, discoveryInfo = None):
+    hass.data[DOMAIN][DATA_ADDERS]["sensor"] = async_add_entities
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     await async_setup_platform(hass, {}, async_add_entities)
 
 
-class BrowserModSensor(BrowserModEntity):
-    domain = PLATFORM
-
-    def __init__(self, hass, connection, deviceID, alias=None):
-        super().__init__(hass, connection, deviceID, alias)
-        self.last_seen = None
-
-    def updated(self):
-        self.last_seen = datetime.now()
-        self.schedule_update_ha_state()
+class BrowserSensor(BrowserModEntity2, SensorEntity):
+    def __init__(self, coordinator, deviceID, parameter,
+            name,
+            unit_of_measurement = None,
+            device_class = None,
+        ):
+        super().__init__(coordinator, deviceID, name)
+        self.parameter = parameter
+        self._device_class = device_class
+        self._unit_of_measurement = unit_of_measurement
 
     @property
-    def state(self):
-        if not self.connection.connection:
-            return STATE_UNAVAILABLE
-        return len(self.connection.connection)
+    def native_value(self):
+        data = self._data
+        data = data.get("browser", {})
+        data = data.get(self.parameter, None)
+        return data
+    @property
+    def device_class(self):
+        return self._device_class
+    @property
+    def native_unit_of_measurement(self):
+        return self._unit_of_measurement
 
     @property
     def extra_state_attributes(self):
-        return {
-            "type": "browser_mod",
-            "last_seen": self.last_seen,
-            "deviceID": self.deviceID,
-            **self.data,
-        }
+        retval = super().extra_state_attributes
+        if self.parameter == "currentUser":
+            retval["userData"] = self._data.get("browser", {}).get("userData")
+        if self.parameter == "path":
+            retval["pathSegments"] = self._data.get("browser", {}).get("path", "").split("/")
+        if self.parameter == "userAgent":
+            retval["userAgent"] = self._data.get("browser", {}).get("userAgent")
+
+        return retval