Sfoglia il codice sorgente

Refactor platform init code.

Even though yaml config has not been supported for some time, the API for it was still there in each platform due to the config flow init calling it.
Refactor so that the config flow init does the work directly (which since the last commit is just one function call to a common function)and remove the unused old API.
Jason Rumney 3 anni fa
parent
commit
ef6c2e9519

+ 3 - 8
custom_components/tuya_local/binary_sensor.py

@@ -5,17 +5,12 @@ from .generic.binary_sensor import TuyaLocalBinarySensor
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the sensor device according to it's type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "binary_sensor",
         TuyaLocalBinarySensor,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/climate.py

@@ -5,17 +5,12 @@ from .generic.climate import TuyaLocalClimate
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the Tuya device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "climate",
         TuyaLocalClimate,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/cover.py

@@ -5,17 +5,12 @@ from .generic.cover import TuyaLocalCover
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the Tuya device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "cover",
         TuyaLocalCover,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/fan.py

@@ -5,17 +5,12 @@ from .generic.fan import TuyaLocalFan
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the Tuya device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "fan",
         TuyaLocalFan,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/humidifier.py

@@ -5,17 +5,12 @@ from .generic.humidifier import TuyaLocalHumidifier
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the Tuya device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "humidifier",
         TuyaLocalHumidifier,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/light.py

@@ -5,17 +5,12 @@ from .generic.light import TuyaLocalLight
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the light device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "light",
         TuyaLocalLight,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/lock.py

@@ -5,17 +5,12 @@ from .generic.lock import TuyaLocalLock
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the lock device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "lock",
         TuyaLocalLock,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/number.py

@@ -5,17 +5,12 @@ from .generic.number import TuyaLocalNumber
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the number entity according to it's type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "number",
         TuyaLocalNumber,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/select.py

@@ -5,17 +5,12 @@ from .generic.select import TuyaLocalSelect
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the select entity according to it's type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "select",
         TuyaLocalSelect,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/sensor.py

@@ -5,17 +5,12 @@ from .generic.sensor import TuyaLocalSensor
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the sensor device according to it's type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "sensor",
         TuyaLocalSensor,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/switch.py

@@ -5,17 +5,12 @@ from .generic.switch import TuyaLocalSwitch
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the switch device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "switch",
         TuyaLocalSwitch,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)

+ 3 - 8
custom_components/tuya_local/vacuum.py

@@ -5,17 +5,12 @@ from .generic.vacuum import TuyaLocalVacuum
 from .helpers.config import async_tuya_setup_platform
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Set up the vacuum device according to its type."""
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    config = {**config_entry.data, **config_entry.options}
     await async_tuya_setup_platform(
         hass,
         async_add_entities,
-        discovery_info,
+        config,
         "vacuum",
         TuyaLocalVacuum,
     )
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    config = {**config_entry.data, **config_entry.options}
-    await async_setup_platform(hass, {}, async_add_entities, config)