Fix incapacity to create switch entity when automatic entity add is disabled at bootstrap

Author: Aohzan

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.6.1
 
-- Fix missing key when bootstrap conf and adding switch
+- Fix incapacity to create switch entity when automatic entity add is disabled at bootstrap
 
 ## 0.6.0
 

custom_components/rfplayer/__init__.py

@@ -96,8 +96,7 @@ async def async_send_command(call):
             event_id = "_".join(
                 [
                     call.data[CONF_PROTOCOL],
-                    call.data.get(CONF_DEVICE_ID) or call.data.get(
-                        CONF_DEVICE_ADDRESS),
+                    call.data.get(CONF_DEVICE_ID) or call.data.get(CONF_DEVICE_ADDRESS),
                 ]
             )
             device = {
@@ -138,8 +137,7 @@ def event_callback(event):
         if entity_id:
             # Propagate event to every entity matching the device id
             _LOGGER.debug("passing event to %s", entity_id)
-            async_dispatcher_send(
-                hass, SIGNAL_HANDLE_EVENT.format(entity_id), event)
+            async_dispatcher_send(hass, SIGNAL_HANDLE_EVENT.format(entity_id), event)
         else:
             # If device is not yet known, register with platform (if loaded)
             if event_type in hass.data[DOMAIN][DATA_DEVICE_REGISTER]:
@@ -213,9 +211,7 @@ async def connect():
                 EVENT_KEY_COMMAND: defaultdict(list),
                 EVENT_KEY_SENSOR: defaultdict(list),
             },
-            DATA_DEVICE_REGISTER: {
-                EVENT_KEY_COMMAND: {}
-            },
+            DATA_DEVICE_REGISTER: {},
         }
 
         if options.get(CONF_AUTOMATIC_ADD, config[CONF_AUTOMATIC_ADD]) is True:
@@ -294,8 +290,7 @@ def handle_event_callback(self, event):
         if identify_event_type(event) == EVENT_KEY_COMMAND:
             self.hass.bus.async_fire(
                 EVENT_BUTTON_PRESSED,
-                {ATTR_ENTITY_ID: self.entity_id,
-                    ATTR_STATE: event[EVENT_KEY_COMMAND]},
+                {ATTR_ENTITY_ID: self.entity_id, ATTR_STATE: event[EVENT_KEY_COMMAND]},
             )
             _LOGGER.debug(
                 "Fired bus event for %s: %s", self.entity_id, event[EVENT_KEY_COMMAND]
@@ -361,10 +356,9 @@ async def async_added_to_hass(self):
     async def async_will_remove_from_hass(self):
         """Clean when entity removed."""
         await super().async_will_remove_from_hass()
-        device_registry = dr.async_get(hass)
+        device_registry = dr.async_get(self.hass)
         device = device_registry.async_get_device(
-            (DOMAIN, self.hass.data[DOMAIN]
-             [CONF_DEVICE] + "_" + self._attr_unique_id)
+            (DOMAIN, self.hass.data[DOMAIN][CONF_DEVICE] + "_" + self._attr_unique_id)
         )
         if device:
             device_registry.async_remove_device(device)

custom_components/rfplayer/number.py

@@ -5,8 +5,8 @@
 from homeassistant.core import callback
 from homeassistant.helpers.entity import EntityCategory
 
-from . import EVENT_KEY_COMMAND, RfplayerDevice
-from .const import DATA_ENTITY_LOOKUP, DOMAIN, EVENT_KEY_ID, RFPLAYER_PROTOCOL
+from . import RfplayerDevice
+from .const import DOMAIN, RFPLAYER_PROTOCOL
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/rfplayer/switch.py

@@ -9,7 +9,6 @@
 from .const import (
     COMMAND_OFF,
     COMMAND_ON,
-    CONF_AUTOMATIC_ADD,
     CONF_DEVICE_ADDRESS,
     DATA_ENTITY_LOOKUP,
     DOMAIN,
@@ -41,8 +40,7 @@ async def add_new_device(device_info):
             if EVENT_KEY_COMMAND in device_info:
                 await add_new_device(device_info)
 
-    if options.get(CONF_AUTOMATIC_ADD, config[CONF_AUTOMATIC_ADD]):
-        hass.data[DOMAIN][DATA_DEVICE_REGISTER][EVENT_KEY_COMMAND] = add_new_device
+    hass.data[DOMAIN][DATA_DEVICE_REGISTER][EVENT_KEY_COMMAND] = add_new_device
 
 
 class RfplayerSwitch(RfplayerDevice, SwitchEntity):