Use EntityDescription - blink (#54360)

homeassistant/components/blink/binary_sensor.py

@@ -1,47 +1,60 @@
 """Support for Blink system camera control."""
+from __future__ import annotations
+
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_MOTION,
     BinarySensorEntity,
+    BinarySensorEntityDescription,
 )
 
 from .const import DOMAIN, TYPE_BATTERY, TYPE_CAMERA_ARMED, TYPE_MOTION_DETECTED
 
-BINARY_SENSORS = {
+BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
-    TYPE_BATTERY: ["Battery", DEVICE_CLASS_BATTERY],
+    BinarySensorEntityDescription(
-    TYPE_CAMERA_ARMED: ["Camera Armed", None],
+        key=TYPE_BATTERY,
-    TYPE_MOTION_DETECTED: ["Motion Detected", DEVICE_CLASS_MOTION],
+        name="Battery",
-}
+        device_class=DEVICE_CLASS_BATTERY,
+    ),
+    BinarySensorEntityDescription(
+        key=TYPE_CAMERA_ARMED,
+        name="Camera Armed",
+    ),
+    BinarySensorEntityDescription(
+        key=TYPE_MOTION_DETECTED,
+        name="Motion Detected",
+        device_class=DEVICE_CLASS_MOTION,
+    ),
+)
 
 
 async def async_setup_entry(hass, config, async_add_entities):
     """Set up the blink binary sensors."""
     data = hass.data[DOMAIN][config.entry_id]
 
-    entities = []
+    entities = [
-    for camera in data.cameras:
+        BlinkBinarySensor(data, camera, description)
-        for sensor_type in BINARY_SENSORS:
+        for camera in data.cameras
-            entities.append(BlinkBinarySensor(data, camera, sensor_type))
+        for description in BINARY_SENSORS_TYPES
+    ]
     async_add_entities(entities)
 
 
 class BlinkBinarySensor(BinarySensorEntity):
     """Representation of a Blink binary sensor."""
 
-    def __init__(self, data, camera, sensor_type):
+    def __init__(self, data, camera, description: BinarySensorEntityDescription):
         """Initialize the sensor."""
         self.data = data
-        self._type = sensor_type
+        self.entity_description = description
-        name, device_class = BINARY_SENSORS[sensor_type]
+        self._attr_name = f"{DOMAIN} {camera} {description.name}"
-        self._attr_name = f"{DOMAIN} {camera} {name}"
-        self._attr_device_class = device_class
         self._camera = data.cameras[camera]
-        self._attr_unique_id = f"{self._camera.serial}-{sensor_type}"
+        self._attr_unique_id = f"{self._camera.serial}-{description.key}"
 
     def update(self):
         """Update sensor state."""
         self.data.refresh()
-        state = self._camera.attributes[self._type]
+        state = self._camera.attributes[self.entity_description.key]
-        if self._type == TYPE_BATTERY:
+        if self.entity_description.key == TYPE_BATTERY:
             state = state != "ok"
         self._attr_is_on = state

homeassistant/components/blink/sensor.py

@@ -1,7 +1,9 @@
 """Support for Blink system camera sensors."""
+from __future__ import annotations
+
 import logging
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import (
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
@@ -13,23 +15,30 @@ from .const import DOMAIN, TYPE_TEMPERATURE, TYPE_WIFI_STRENGTH
 
 _LOGGER = logging.getLogger(__name__)
 
-SENSORS = {
+SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
-    TYPE_TEMPERATURE: ["Temperature", TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE],
+    SensorEntityDescription(
-    TYPE_WIFI_STRENGTH: [
+        key=TYPE_TEMPERATURE,
-        "Wifi Signal",
+        name="Temperature",
-        SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        native_unit_of_measurement=TEMP_FAHRENHEIT,
-        DEVICE_CLASS_SIGNAL_STRENGTH,
+        device_class=DEVICE_CLASS_TEMPERATURE,
-    ],
+    ),
-}
+    SensorEntityDescription(
+        key=TYPE_WIFI_STRENGTH,
+        name="Wifi Signal",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
+    ),
+)
 
 
 async def async_setup_entry(hass, config, async_add_entities):
     """Initialize a Blink sensor."""
     data = hass.data[DOMAIN][config.entry_id]
-    entities = []
+    entities = [
-    for camera in data.cameras:
+        BlinkSensor(data, camera, description)
-        for sensor_type in SENSORS:
+        for camera in data.cameras
-            entities.append(BlinkSensor(data, camera, sensor_type))
+        for description in SENSOR_TYPES
+    ]
 
     async_add_entities(entities)
 
@@ -37,17 +46,17 @@ async def async_setup_entry(hass, config, async_add_entities):
 class BlinkSensor(SensorEntity):
     """A Blink camera sensor."""
 
-    def __init__(self, data, camera, sensor_type):
+    def __init__(self, data, camera, description: SensorEntityDescription):
         """Initialize sensors from Blink camera."""
-        name, units, device_class = SENSORS[sensor_type]
+        self.entity_description = description
-        self._attr_name = f"{DOMAIN} {camera} {name}"
+        self._attr_name = f"{DOMAIN} {camera} {description.name}"
-        self._attr_device_class = device_class
         self.data = data
         self._camera = data.cameras[camera]
-        self._attr_native_unit_of_measurement = units
+        self._attr_unique_id = f"{self._camera.serial}-{description.key}"
-        self._attr_unique_id = f"{self._camera.serial}-{sensor_type}"
         self._sensor_key = (
-            "temperature_calibrated" if sensor_type == "temperature" else sensor_type
+            "temperature_calibrated"
+            if description.key == "temperature"
+            else description.key
         )
 
     def update(self):