fixup! Make main light the primary entity when keep_main_light is enabled in WLED

Author: mik-laj

homeassistant/components/wled/__init__.py

@@ -11,7 +11,7 @@
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
-from .const import DOMAIN
+from .const import CONF_KEEP_MAIN_LIGHT, DOMAIN
 from .coordinator import (
     WLEDConfigEntry,
     WLEDDataUpdateCoordinator,
@@ -127,6 +127,14 @@ async def async_migrate_entry(
                 version=1,
                 minor_version=2,
             )
+        if config_entry.minor_version < 3:
+            # 1.3: Keep existing behavior for users upgrading — new installs default to True.
+            hass.config_entries.async_update_entry(
+                config_entry,
+                options={CONF_KEEP_MAIN_LIGHT: False} | config_entry.options,
+                version=1,
+                minor_version=3,
+            )
 
     _LOGGER.debug(
         "Migration to configuration version %s.%s successful",

homeassistant/components/wled/config_flow.py

@@ -36,7 +36,7 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a WLED config flow."""
 
     VERSION = 1
-    MINOR_VERSION = 2
+    MINOR_VERSION = 3
     discovered_host: str
     discovered_device: Device
 

homeassistant/components/wled/const.py

@@ -16,7 +16,7 @@
 
 # Options
 CONF_KEEP_MAIN_LIGHT = "keep_master_light"
-DEFAULT_KEEP_MAIN_LIGHT = False
+DEFAULT_KEEP_MAIN_LIGHT = True
 
 # Attributes
 ATTR_CCT = "cct"

homeassistant/components/wled/light.py

@@ -124,8 +124,8 @@ def __init__(
         super().__init__(coordinator=coordinator)
         self._segment = segment
 
-        # Segment 0 uses a simpler name, which is more natural for when using
-        # a single segment / using WLED with one big LED strip.
+        # With keep_main_light disabled, a single-segment setup uses segment 0
+        # as the primary entity — it drops the "Segment N" qualifier.
         if segment == 0 and not coordinator.keep_main_light:
             self._attr_name = None
         else:

homeassistant/components/wled/number.py

@@ -84,9 +84,11 @@ def __init__(
         super().__init__(coordinator=coordinator)
         self.entity_description = description
 
-        # Segment 0 uses a simpler name, which is more natural for when using
-        # a single segment / using WLED with one big LED strip.
-        if segment != 0 or coordinator.keep_main_light:
+        # With keep_main_light disabled, a single-segment setup uses segment 0
+        # as the primary entity — it drops the "Segment N" qualifier.
+        if segment == 0 and not coordinator.keep_main_light:
+            self._attr_translation_key = description.translation_key
+        else:
             self._attr_translation_key = description.segment_translation_key
             self._attr_translation_placeholders = {"segment": str(segment)}
 

homeassistant/components/wled/select.py

@@ -159,8 +159,8 @@ def __init__(self, coordinator: WLEDDataUpdateCoordinator, segment: int) -> None
         """Initialize WLED ."""
         super().__init__(coordinator=coordinator)
 
-        # Segment 0 uses a simpler name, which is more natural for when using
-        # a single segment / using WLED with one big LED strip.
+        # With keep_main_light disabled, a single-segment setup uses segment 0
+        # as the primary entity — it drops the "Segment N" qualifier.
         if segment != 0 or coordinator.keep_main_light:
             self._attr_translation_key = "segment_color_palette"
             self._attr_translation_placeholders = {"segment": str(segment)}

homeassistant/components/wled/switch.py

@@ -194,13 +194,13 @@ def __init__(
         self.entity_description = description
         self._segment = segment
 
-        # Segment 0 uses a simpler name, which is more natural for when using
-        # a single segment / using WLED with one big LED strip.
-        if segment != 0 or coordinator.keep_main_light:
+        # With keep_main_light disabled, a single-segment setup uses segment 0
+        # as the primary entity — it drops the "Segment N" qualifier.
+        if segment == 0 and not coordinator.keep_main_light:
+            self._attr_translation_key = description.translation_key
+        else:
             self._attr_translation_key = description.segment_translation_key
             self._attr_translation_placeholders = {"segment": str(segment)}
-        else:
-            self._attr_translation_key = description.translation_key
 
         self._attr_unique_id = (
             f"{coordinator.data.info.mac_address}_{description.key}_{segment}"

tests/components/wled/conftest.py

@@ -7,6 +7,7 @@
 import pytest
 from wled import Device as WLEDDevice, Releases
 
+from homeassistant.components.wled.config_flow import CONF_KEEP_MAIN_LIGHT
 from homeassistant.components.wled.const import DOMAIN
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
@@ -22,7 +23,7 @@ def mock_config_entry() -> MockConfigEntry:
         domain=DOMAIN,
         data={CONF_HOST: "192.168.1.123"},
         unique_id="aabbccddeeff",
-        minor_version=2,
+        minor_version=3,
     )
 
 
@@ -89,12 +90,19 @@ def mock_wled(
         yield wled
 
 
+@pytest.fixture
+def opt_keep_main_light() -> bool | None:
+    """Return the conf_keep_main_light option."""
+    return None
+
+
 @pytest.fixture
 async def init_integration(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
     mock_config_entry: MockConfigEntry,
     mock_wled: MagicMock,
+    opt_keep_main_light: bool | None,
 ) -> MockConfigEntry:
     """Set up the WLED integration for testing."""
     mock_config_entry.add_to_hass(hass)
@@ -106,4 +114,11 @@ async def init_integration(
     # time by SCAN_INTERVAL
     freezer.tick(1)
 
+    if opt_keep_main_light is not None:
+        hass.config_entries.async_update_entry(
+            mock_config_entry, options={CONF_KEEP_MAIN_LIGHT: opt_keep_main_light}
+        )
+        await hass.config_entries.async_reload(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
     return mock_config_entry