Refactor RFLink component (#17402)

* Start refactor of RFLink component

* alias _id not added correctly

Aliases for sensor not added correctly
And some debug traces.

* Update rflink.py

* Cleanup, fix review comments

* Call event handlers directly when processing initial event

* Use hass.async_create_task when adding discovered device

* Review comments

* Review comments

homeassistant/components/switch/rflink.py

@@ -10,23 +10,22 @@ from homeassistant.components.rflink import (
     CONF_ALIASES, CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES,
     CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES, CONF_GROUP_ALIASSES,
     CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES, CONF_SIGNAL_REPETITIONS,
-    DATA_ENTITY_GROUP_LOOKUP, DATA_ENTITY_LOOKUP, DEVICE_DEFAULTS_SCHEMA,
-    DOMAIN, EVENT_KEY_COMMAND, SwitchableRflinkDevice, cv, remove_deprecated,
-    vol)
-from homeassistant.components.switch import SwitchDevice
-from homeassistant.const import CONF_NAME, CONF_PLATFORM
-from homeassistant.helpers.deprecation import get_deprecated
+    DEVICE_DEFAULTS_SCHEMA, SwitchableRflinkDevice, cv,
+    remove_deprecated, vol)
+from homeassistant.components.switch import (
+    PLATFORM_SCHEMA, SwitchDevice)
+
+from homeassistant.const import CONF_NAME
 
 DEPENDENCIES = ['rflink']
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): DOMAIN,
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_DEVICE_DEFAULTS, default=DEVICE_DEFAULTS_SCHEMA({})):
-    DEVICE_DEFAULTS_SCHEMA,
-    vol.Optional(CONF_DEVICES, default={}): vol.Schema({
-        cv.string: {
+        DEVICE_DEFAULTS_SCHEMA,
+    vol.Optional(CONF_DEVICES, default={}): {
+        cv.string: vol.Schema({
             vol.Optional(CONF_NAME): cv.string,
             vol.Optional(CONF_ALIASES, default=[]):
                 vol.All(cv.ensure_list, [cv.string]),
@@ -44,50 +43,27 @@ PLATFORM_SCHEMA = vol.Schema({
                 vol.All(cv.ensure_list, [cv.string]),
             vol.Optional(CONF_NOGROUP_ALIASSES):
                 vol.All(cv.ensure_list, [cv.string]),
-        },
-    }),
-})
+        })
+    },
+}, extra=vol.ALLOW_EXTRA)
 
 
-def devices_from_config(domain_config, hass=None):
+def devices_from_config(domain_config):
     """Parse configuration and add Rflink switch devices."""
     devices = []
     for device_id, config in domain_config[CONF_DEVICES].items():
         device_config = dict(domain_config[CONF_DEVICE_DEFAULTS], **config)
         remove_deprecated(device_config)
-        device = RflinkSwitch(device_id, hass, **device_config)
+        device = RflinkSwitch(device_id, **device_config)
         devices.append(device)
 
-        # Register entity (and aliases) to listen to incoming rflink events
-        # Device id and normal aliases respond to normal and group command
-        hass.data[DATA_ENTITY_LOOKUP][
-            EVENT_KEY_COMMAND][device_id].append(device)
-        if config[CONF_GROUP]:
-            hass.data[DATA_ENTITY_GROUP_LOOKUP][
-                EVENT_KEY_COMMAND][device_id].append(device)
-        for _id in get_deprecated(config, CONF_ALIASES, CONF_ALIASSES):
-            hass.data[DATA_ENTITY_LOOKUP][
-                EVENT_KEY_COMMAND][_id].append(device)
-            hass.data[DATA_ENTITY_GROUP_LOOKUP][
-                EVENT_KEY_COMMAND][_id].append(device)
-        # group_aliases only respond to group commands
-        for _id in get_deprecated(
-                config, CONF_GROUP_ALIASES, CONF_GROUP_ALIASSES):
-            hass.data[DATA_ENTITY_GROUP_LOOKUP][
-                EVENT_KEY_COMMAND][_id].append(device)
-        # nogroup_aliases only respond to normal commands
-        for _id in get_deprecated(
-                config, CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES):
-            hass.data[DATA_ENTITY_LOOKUP][
-                EVENT_KEY_COMMAND][_id].append(device)
-
     return devices
 
 
 async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Rflink platform."""
-    async_add_entities(devices_from_config(config, hass))
+    async_add_entities(devices_from_config(config))
 
 
 class RflinkSwitch(SwitchableRflinkDevice, SwitchDevice):