Backwards compatible with config

AlexxIT · Apr 28, 2023 · 75f331f · 75f331f
1 parent 1b379b8
commit 75f331f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 23 deletions.
diff --git a/custom_components/yandex_station/humidifier.py b/custom_components/yandex_station/humidifier.py
@@ -29,9 +29,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexHumidifier(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
 
     platform = entity_platform.async_get_current_platform()

diff --git a/custom_components/yandex_station/light.py b/custom_components/yandex_station/light.py
@@ -18,9 +18,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexLight(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
     async_add_entities(devices, True)
 

diff --git a/custom_components/yandex_station/remote.py b/custom_components/yandex_station/remote.py
@@ -21,9 +21,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexOther(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
     async_add_entities(devices, True)
 

diff --git a/custom_components/yandex_station/sensor.py b/custom_components/yandex_station/sensor.py
@@ -43,11 +43,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
 
     devices = []
     for device in quasar.devices:
-        if (
-            next((inc for inc in include if inc["name"] == device["name"]), None)
-            is not None
-            and device["type"] in DEVICES
-        ):
+        if device["name"] in include and device["type"] in DEVICES:
             data = await quasar.get_device(device["id"])
             for prop in data["properties"]:
                 for description in SENSOR_TYPES:

diff --git a/custom_components/yandex_station/switch.py b/custom_components/yandex_station/switch.py
@@ -15,9 +15,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexSwitch(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
     async_add_entities(devices, True)
 

diff --git a/custom_components/yandex_station/vacuum.py b/custom_components/yandex_station/vacuum.py
@@ -25,9 +25,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexVacuum(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
     async_add_entities(devices)
 

diff --git a/custom_components/yandex_station/water_heater.py b/custom_components/yandex_station/water_heater.py
@@ -21,9 +21,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     devices = [
         YandexKettle(quasar, device)
         for device in quasar.devices
-        if next((inc for inc in include if inc["name"] == device["name"]), None)
-        is not None
-        and device["type"] in DEVICES
+        if device["name"] in include and device["type"] in DEVICES
     ]
     async_add_entities(devices, True)