From 55dc4b0d2c7450955e8d0cb37a0031aee61bed9b Mon Sep 17 00:00:00 2001
From: Sven Naumann <3747263+sVnsation@users.noreply.github.com>
Date: Wed, 1 Jan 2025 13:49:13 +0100
Subject: [PATCH] Implement base entity class for Twinkly (#134382)

* implement base entity class for twinkly

* Update homeassistant/components/twinkly/entity.py

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>

* super init

---------

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
---
 homeassistant/components/twinkly/entity.py | 27 ++++++++++++++++++++++
 homeassistant/components/twinkly/light.py  | 25 ++++----------------
 2 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 homeassistant/components/twinkly/entity.py

diff --git a/homeassistant/components/twinkly/entity.py b/homeassistant/components/twinkly/entity.py
new file mode 100644
index 00000000000..0a0f321bb17
--- /dev/null
+++ b/homeassistant/components/twinkly/entity.py
@@ -0,0 +1,27 @@
+"""Base entity for Twinkly."""
+
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DEV_MODEL, DEV_NAME, DOMAIN
+from .coordinator import TwinklyCoordinator
+
+
+class TwinklyEntity(CoordinatorEntity[TwinklyCoordinator]):
+    """Defines a base Twinkly entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: TwinklyCoordinator) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+        device_info = coordinator.data.device_info
+        mac = device_info["mac"]
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, mac)},
+            connections={(CONNECTION_NETWORK_MAC, mac)},
+            manufacturer="LEDWORKS",
+            model=device_info[DEV_MODEL],
+            name=device_info[DEV_NAME],
+            sw_version=coordinator.software_version,
+        )
diff --git a/homeassistant/components/twinkly/light.py b/homeassistant/components/twinkly/light.py
index 1dfd6c1df30..de55aa5f217 100644
--- a/homeassistant/components/twinkly/light.py
+++ b/homeassistant/components/twinkly/light.py
@@ -15,19 +15,11 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import TwinklyConfigEntry, TwinklyCoordinator
-from .const import (
-    DEV_LED_PROFILE,
-    DEV_MODEL,
-    DEV_NAME,
-    DEV_PROFILE_RGB,
-    DEV_PROFILE_RGBW,
-    DOMAIN,
-)
+from .const import DEV_LED_PROFILE, DEV_PROFILE_RGB, DEV_PROFILE_RGBW
+from .entity import TwinklyEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,10 +35,9 @@ async def async_setup_entry(
     async_add_entities([entity], update_before_add=True)
 
 
-class TwinklyLight(CoordinatorEntity[TwinklyCoordinator], LightEntity):
+class TwinklyLight(TwinklyEntity, LightEntity):
     """Implementation of the light for the Twinkly service."""
 
-    _attr_has_entity_name = True
     _attr_name = None
     _attr_translation_key = "light"
 
@@ -54,7 +45,7 @@ class TwinklyLight(CoordinatorEntity[TwinklyCoordinator], LightEntity):
         """Initialize a TwinklyLight entity."""
         super().__init__(coordinator)
         device_info = coordinator.data.device_info
-        self._attr_unique_id = mac = device_info["mac"]
+        self._attr_unique_id = device_info["mac"]
 
         if device_info.get(DEV_LED_PROFILE) == DEV_PROFILE_RGBW:
             self._attr_supported_color_modes = {ColorMode.RGBW}
@@ -68,14 +59,6 @@ class TwinklyLight(CoordinatorEntity[TwinklyCoordinator], LightEntity):
             self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
             self._attr_color_mode = ColorMode.BRIGHTNESS
         self.client = coordinator.client
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, mac)},
-            connections={(CONNECTION_NETWORK_MAC, mac)},
-            manufacturer="LEDWORKS",
-            model=device_info[DEV_MODEL],
-            name=device_info[DEV_NAME],
-            sw_version=coordinator.software_version,
-        )
         if coordinator.supports_effects:
             self._attr_supported_features = LightEntityFeature.EFFECT
         self._update_attr()