Use asyncio Lock for fibaro light (#18622)

* Use asyncio Lock for fibaro light

* line length and empty line at end

* async turn_off

Turned the turn_off into async as well

* bless you, blank lines...

My local flake8 lies to me. Not cool.
This commit is contained in:
pbalogh77 2018-11-26 13:17:56 +01:00 committed by Martin Hjelmare
parent b5b5bc2de8
commit 4a661e351f

View File

@ -6,7 +6,8 @@ https://home-assistant.io/components/light.fibaro/
"""
import logging
import threading
import asyncio
from functools import partial
from homeassistant.components.light import (
ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_WHITE_VALUE, ENTITY_ID_FORMAT,
@ -37,12 +38,15 @@ def scaleto100(value):
return max(0, min(100, ((value * 100.4) / 255.0)))
def setup_platform(hass, config, add_entities, discovery_info=None):
async def async_setup_platform(hass,
config,
async_add_entities,
discovery_info=None):
"""Perform the setup for Fibaro controller devices."""
if discovery_info is None:
return
add_entities(
async_add_entities(
[FibaroLight(device, hass.data[FIBARO_CONTROLLER])
for device in hass.data[FIBARO_DEVICES]['light']], True)
@ -58,7 +62,7 @@ class FibaroLight(FibaroDevice, Light):
self._brightness = None
self._white = 0
self._update_lock = threading.RLock()
self._update_lock = asyncio.Lock()
if 'levelChange' in fibaro_device.interfaces:
self._supported_flags |= SUPPORT_BRIGHTNESS
if 'color' in fibaro_device.properties:
@ -88,9 +92,14 @@ class FibaroLight(FibaroDevice, Light):
"""Flag supported features."""
return self._supported_flags
def turn_on(self, **kwargs):
async def async_turn_on(self, **kwargs):
"""Turn the light on."""
with self._update_lock:
async with self._update_lock:
await self.hass.async_add_executor_job(
partial(self._turn_on, **kwargs))
def _turn_on(self, **kwargs):
"""Really turn the light on."""
if self._supported_flags & SUPPORT_BRIGHTNESS:
target_brightness = kwargs.get(ATTR_BRIGHTNESS)
@ -128,10 +137,15 @@ class FibaroLight(FibaroDevice, Light):
# The simplest case is left for last. No dimming, just switch on
self.call_turn_on()
def turn_off(self, **kwargs):
async def async_turn_off(self, **kwargs):
"""Turn the light off."""
async with self._update_lock:
await self.hass.async_add_executor_job(
partial(self._turn_off, **kwargs))
def _turn_off(self, **kwargs):
"""Really turn the light off."""
# Let's save the last brightness level before we switch it off
with self._update_lock:
if (self._supported_flags & SUPPORT_BRIGHTNESS) and \
self._brightness and self._brightness > 0:
self._last_brightness = self._brightness
@ -143,10 +157,14 @@ class FibaroLight(FibaroDevice, Light):
"""Return true if device is on."""
return self.current_binary_state
def update(self):
"""Call to update state."""
async def async_update(self):
"""Update the state."""
async with self._update_lock:
await self.hass.async_add_executor_job(self._update)
def _update(self):
"""Really update the state."""
# Brightness handling
with self._update_lock:
if self._supported_flags & SUPPORT_BRIGHTNESS:
self._brightness = float(self.fibaro_device.properties.value)
# Color handling