Improve model strins

Author: astrandb

custom_components/weatherlink/__init__.py

@@ -92,8 +92,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                 ]
             ):
                 sensors.append(sensor)
-                # todo Remove
-                # print(f"{sensor['parent_device_id']} {sensor['sensor_type']}")
         hass.data[DOMAIN][entry.entry_id]["sensors_metadata"] = sensors
     coordinator = await get_coordinator(hass, entry)
     if not coordinator.last_update_success:

custom_components/weatherlink/binary_sensor.py

@@ -16,7 +16,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import get_coordinator
+from . import SENSOR_TYPE_VUE_AND_VANTAGE_PRO, get_coordinator
 from .const import (
     CONF_API_VERSION,
     CONFIG_URL,
@@ -175,13 +175,25 @@ def generate_model(self):
             model: str = self.hass.data[DOMAIN][self.entry.entry_id]["station_data"][
                 "stations"
             ][0].get("product_number")
-        if model == "6555":
-            return f"WeatherLinkIP {model}"
-        if model.startswith("6100"):
-            return f"WeatherLink Live {model}"
-        if model.startswith("6313"):
-            return f"WeatherLink Console {model}"
-        return "WeatherLink"
+            for sensor in self.hass.data[DOMAIN][self.entry.entry_id][
+                "sensors_metadata"
+            ]:
+                if (
+                    sensor["sensor_type"] in SENSOR_TYPE_VUE_AND_VANTAGE_PRO
+                    and sensor["tx_id"] is None
+                    or sensor["tx_id"] == self.tx_id
+                ):
+                    product_name = sensor["product_name"]
+                    break
+            gateway_type = "WeatherLink"
+            if model == "6555":
+                gateway_type = f"WLIP {model}"
+            if model.startswith("6100"):
+                gateway_type = f"WLL {model}"
+            if model.startswith("6313"):
+                gateway_type = f"WLC {model}"
+
+        return f"{gateway_type} / {product_name}" if self.tx_id == 1 else product_name
 
     @property
     def is_on(self):

custom_components/weatherlink/sensor.py

@@ -29,7 +29,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import get_coordinator
+from . import SENSOR_TYPE_VUE_AND_VANTAGE_PRO, get_coordinator
 from .const import (
     CONF_API_VERSION,
     CONFIG_URL,
@@ -459,13 +459,25 @@ def generate_model(self):
             model: str = self.hass.data[DOMAIN][self.entry.entry_id]["station_data"][
                 "stations"
             ][0].get("product_number")
-        if model == "6555":
-            return f"WeatherLinkIP {model}"
-        if model.startswith("6100"):
-            return f"WeatherLink Live {model}"
-        if model.startswith("6313"):
-            return f"WeatherLink Console {model}"
-        return "WeatherLink"
+            for sensor in self.hass.data[DOMAIN][self.entry.entry_id][
+                "sensors_metadata"
+            ]:
+                if (
+                    sensor["sensor_type"] in SENSOR_TYPE_VUE_AND_VANTAGE_PRO
+                    and sensor["tx_id"] is None
+                    or sensor["tx_id"] == self.tx_id
+                ):
+                    product_name = sensor["product_name"]
+                    break
+            gateway_type = "WeatherLink"
+            if model == "6555":
+                gateway_type = f"WLIP {model}"
+            if model.startswith("6100"):
+                gateway_type = f"WLL {model}"
+            if model.startswith("6313"):
+                gateway_type = f"WLC {model}"
+
+        return f"{gateway_type} / {product_name}" if self.tx_id == 1 else product_name
 
     @property
     def native_value(self):