From 7f6deaa7da92c1ee20a6df471b2503916f08d7ba Mon Sep 17 00:00:00 2001
From: Bas Nijholt <bas@nijho.lt>
Date: Sat, 3 Oct 2020 17:36:26 +0200
Subject: [PATCH] bug fixes

---
 .../adaptive_lighting/__init__.py             |  3 --
 custom_components/adaptive_lighting/switch.py | 35 +++++++------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/custom_components/adaptive_lighting/__init__.py b/custom_components/adaptive_lighting/__init__.py
index 88f81dc8..b5ec5bc5 100755
--- a/custom_components/adaptive_lighting/__init__.py
+++ b/custom_components/adaptive_lighting/__init__.py
@@ -28,7 +28,6 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 import homeassistant.helpers.config_validation as cv
 
@@ -98,8 +97,6 @@ async def async_unload_entry(hass, config_entry: ConfigEntry) -> bool:
     )
     data = hass.data[DOMAIN]
     data[config_entry.entry_id][UNDO_UPDATE_LISTENER]()
-    switch = data[config_entry.entry_id][SWITCH_DOMAIN]
-    switch._remove_listeners()  # pylint: disable=protected-access
     if len(data) == 1:  # no more config_entries
         data.pop(ATTR_TURN_ON_OFF_LISTENER).remove_listener()
 
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 358bb777..2e5820c3 100755
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -52,7 +52,6 @@ from homeassistant.helpers.event import (
 )
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.sun import get_astral_location
-from homeassistant.util import slugify
 from homeassistant.util.color import (
     color_RGB_to_xy,
     color_temperature_kelvin_to_mired,
@@ -259,7 +258,6 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
 
         # Set other attributes
         self._icon = ICON
-        self._entity_id = f"switch.{DOMAIN}_{slugify(self._name)}"
         self._state = None
 
         # Tracks 'off' → 'on' state changes
@@ -287,20 +285,15 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
             data,
         )
 
-    @property
-    def entity_id(self):
-        """Return the entity ID of the switch."""
-        return self._entity_id
-
     @property
     def name(self):
         """Return the name of the device if any."""
         return f"Adaptive Lighting: {self._name}"
 
-    # @property
-    # def unique_id(self):
-    #     """Return the unique ID of entity."""
-    #     return self._name
+    @property
+    def unique_id(self):
+        """Return the unique ID of entity."""
+        return self._name
 
     @property
     def is_on(self) -> Optional[bool]:
@@ -323,6 +316,10 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
             self._state = False
             assert not self.remove_listeners
 
+    async def async_will_remove_from_hass(self):
+        """Remove the listeners upon removing the component."""
+        self._remove_listeners()
+
     def _expand_light_groups(self) -> None:
         all_lights = _expand_light_groups(self.hass, self._lights)
         self.turn_on_off_listener.lights.update(all_lights)
@@ -568,23 +565,17 @@ class AdaptiveSleepModeSwitch(SwitchEntity, RestoreEntity):
         data = validate(config_entry)
         self._name = data[CONF_NAME]
         self._icon = ICON
-        self._entity_id = f"switch.{DOMAIN}_sleep_mode_{slugify(self._name)}"
         self._state = None
 
-    @property
-    def entity_id(self):
-        """Return the entity ID of the switch."""
-        return self._entity_id
-
     @property
     def name(self):
         """Return the name of the device if any."""
         return f"Adaptive Lighting Sleep Mode: {self._name}"
 
-    # @property
-    # def unique_id(self):
-    #     """Return the unique ID of entity."""
-    #     return f"{self._name}_sleep_mode"
+    @property
+    def unique_id(self):
+        """Return the unique ID of entity."""
+        return f"{self._name}_sleep_mode"
 
     @property
     def icon(self) -> str:
@@ -818,7 +809,7 @@ class TurnOnOffListener:
         adaptive_lighting_context: Context,
     ):
         """Check if the light has been 'on' and is now manually being adjusted."""
-        manually_controlled = self.manually_controlled[light]
+        manually_controlled = self.manually_controlled.setdefault(light, False)
         if manually_controlled:
             # Manually controlled until light is turned on and off
             return True