home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-07 06:35:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Review incorporated

Browse Source
This commit is contained in:
Sebastian Muszynski
2018-03-20 07:38:46 +01:00
parent c17482b7a8
commit 37ab4a585a
1 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
homeassistant/components/fan/xiaomi_miio.py
View File

@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation
https://home-assistant.io/components/fan.xiaomi_miio/ https://home-assistant.io/components/fan.xiaomi_miio/
""" """
import asyncio import asyncio
from enum import Enum
from functools import partial from functools import partial
import logging import logging
@@ -442,8 +443,6 @@ class XiaomiGenericDevice(FanEntity):
@staticmethod @staticmethod
def _extract_value_from_attribute(state, attribute): def _extract_value_from_attribute(state, attribute):
from enum import Enum
value = getattr(state, attribute) value = getattr(state, attribute)
if isinstance(value, Enum): if isinstance(value, Enum):
return value.value return value.value
@@ -534,16 +533,19 @@ class XiaomiAirPurifier(XiaomiGenericDevice):
if self._model == MODEL_AIRPURIFIER_PRO: if self._model == MODEL_AIRPURIFIER_PRO:
self._device_features = FEATURE_FLAGS_AIRPURIFIER_PRO self._device_features = FEATURE_FLAGS_AIRPURIFIER_PRO
self._state_attrs.update({attribute: None for attribute in self._available_attributes = AVAILABLE_ATTRIBUTES_AIRPURIFIER_PRO
AVAILABLE_ATTRIBUTES_AIRPURIFIER_PRO}) self._speed_list = OPERATION_MODES_AIRPURIFIER_PRO
elif self._model == MODEL_AIRPURIFIER_V3: elif self._model == MODEL_AIRPURIFIER_V3:
self._device_features = FEATURE_FLAGS_AIRPURIFIER_V3 self._device_features = FEATURE_FLAGS_AIRPURIFIER_V3
self._state_attrs.update({attribute: None for attribute in self._available_attributes = AVAILABLE_ATTRIBUTES_AIRPURIFIER_V3
AVAILABLE_ATTRIBUTES_AIRPURIFIER_V3}) self._speed_list = OPERATION_MODES_AIRPURIFIER_V3
else: else:
self._device_features = FEATURE_FLAGS_AIRPURIFIER self._device_features = FEATURE_FLAGS_AIRPURIFIER
self._state_attrs.update({attribute: None for attribute in self._available_attributes = AVAILABLE_ATTRIBUTES_AIRPURIFIER
AVAILABLE_ATTRIBUTES_AIRPURIFIER}) self._speed_list = OPERATION_MODES_AIRPURIFIER
self._state_attrs.update(
{attribute: None for attribute in self._available_attributes})
async def async_update(self): async def async_update(self):
"""Fetch state from the device.""" """Fetch state from the device."""
@@ -561,22 +563,9 @@ class XiaomiAirPurifier(XiaomiGenericDevice):
self._available = True self._available = True
self._state = state.is_on self._state = state.is_on
self._state_attrs.update(
if self._model == MODEL_AIRPURIFIER_PRO: {key: self._extract_value_from_attribute(state, value) for
self._state_attrs.update( key, value in self._available_attributes.items()})
{key: self._extract_value_from_attribute(state, value)
for key, value in
AVAILABLE_ATTRIBUTES_AIRPURIFIER_PRO.items()})
elif self._model == MODEL_AIRPURIFIER_V3:
self._state_attrs.update(
{key: self._extract_value_from_attribute(state, value)
for key, value in
AVAILABLE_ATTRIBUTES_AIRPURIFIER_V3.items()})
else:
self._state_attrs.update(
{key: self._extract_value_from_attribute(state, value)
for key, value in
AVAILABLE_ATTRIBUTES_AIRPURIFIER.items()})
except DeviceException as ex: except DeviceException as ex:
self._available = False self._available = False
@@ -585,12 +574,7 @@ class XiaomiAirPurifier(XiaomiGenericDevice):
@property @property
def speed_list(self) -> list: def speed_list(self) -> list:
"""Get the list of available speeds.""" """Get the list of available speeds."""
if self._model == MODEL_AIRPURIFIER_PRO: return self.speed_list
return OPERATION_MODES_AIRPURIFIER_PRO
elif self._model == MODEL_AIRPURIFIER_V3:
return OPERATION_MODES_AIRPURIFIER_V3
return OPERATION_MODES_AIRPURIFIER
@property @property
def speed(self): def speed(self):
@@ -722,16 +706,22 @@ class XiaomiAirHumidifier(XiaomiGenericDevice):
def __init__(self, name, device, model, unique_id): def __init__(self, name, device, model, unique_id):
"""Initialize the plug switch.""" """Initialize the plug switch."""
from miio.airpurifier import OperationMode
super().__init__(name, device, model, unique_id) super().__init__(name, device, model, unique_id)
if self._model == MODEL_AIRHUMIDIFIER_CA: if self._model == MODEL_AIRHUMIDIFIER_CA:
self._device_features = FEATURE_FLAGS_AIRHUMIDIFIER_CA self._device_features = FEATURE_FLAGS_AIRHUMIDIFIER_CA
self._state_attrs.update({attribute: None for attribute in self._available_attributes = AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER_CA
AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER_CA}) self._speed_list = [mode.name for mode in OperationMode if
mode.name != 'Auto']
else: else:
self._device_features = FEATURE_FLAGS_AIRHUMIDIFIER self._device_features = FEATURE_FLAGS_AIRHUMIDIFIER
self._state_attrs.update({attribute: None for attribute in self._available_attributes = AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER
AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER}) self._speed_list = [mode.name for mode in OperationMode]
self._state_attrs.update(
{attribute: None for attribute in self._available_attributes})
async def async_update(self): async def async_update(self):
"""Fetch state from the device.""" """Fetch state from the device."""
@@ -743,23 +733,14 @@ class XiaomiAirHumidifier(XiaomiGenericDevice):
return return
try: try:
state = await self.hass.async_add_job( state = await self.hass.async_add_job(self._device.status)
self._device.status)
_LOGGER.debug("Got new state: %s", state) _LOGGER.debug("Got new state: %s", state)
self._available = True self._available = True
self._state = state.is_on self._state = state.is_on
self._state_attrs.update(
if self._model == MODEL_AIRHUMIDIFIER_CA: {key: self._extract_value_from_attribute(state, value) for
self._state_attrs.update( key, value in self._available_attributes.items()})
{key: self._extract_value_from_attribute(state, value)
for key, value in
AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER_CA.items()})
else:
self._state_attrs.update(
{key: self._extract_value_from_attribute(state, value)
for key, value in
AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER.items()})
except DeviceException as ex: except DeviceException as ex:
self._available = False self._available = False
@@ -767,12 +748,7 @@ class XiaomiAirHumidifier(XiaomiGenericDevice):
def speed_list(self) -> list: def speed_list(self) -> list:
"""Get the list of available speeds.""" """Get the list of available speeds."""
from miio.airpurifier import OperationMode return self._speed_list
if self._model == MODEL_AIRHUMIDIFIER_V1:
return [mode.name for mode in OperationMode if mode.name != 'Auto']
# Air Humidifier CA
return [mode.name for mode in OperationMode]
@property @property
def speed(self): def speed(self):