Skip to content

Commit

Permalink
Code cleanup of velux scene (#12390)
Browse files Browse the repository at this point in the history
* Code cleanup of velux scene

* fixed review comments

* fixed review comments
  • Loading branch information
Julius2342 authored and MartinHjelmare committed Feb 14, 2018
1 parent 6f043f3 commit f25d56d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 25 deletions.
33 changes: 11 additions & 22 deletions homeassistant/components/scene/velux.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,39 @@
For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/scene.velux/
"""
import asyncio

from homeassistant.components.scene import Scene
from homeassistant.components.velux import _LOGGER, DATA_VELUX


DEPENDENCIES = ['velux']


def setup_platform(hass, config, add_devices, discovery_info=None):
@asyncio.coroutine
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up the scenes for velux platform."""
if DATA_VELUX not in hass.data \
or not hass.data[DATA_VELUX].initialized:
return False

entities = []
for scene in hass.data[DATA_VELUX].pyvlx.scenes:
entities.append(VeluxScene(hass, scene))
add_devices(entities)
return True
entities.append(VeluxScene(scene))
async_add_devices(entities)


class VeluxScene(Scene):
"""Representation of a velux scene."""

def __init__(self, hass, scene):
def __init__(self, scene):
"""Init velux scene."""
_LOGGER.info("Adding VELUX scene: %s", scene)
self.hass = hass
self.scene = scene

@property
def name(self):
"""Return the name of the scene."""
return self.scene.name

@property
def should_poll(self):
"""Return that polling is not necessary."""
return False

@property
def is_on(self):
"""There is no way of detecting if a scene is active (yet)."""
return False

def activate(self):
@asyncio.coroutine
def async_activate(self):
"""Activate the scene."""
self.hass.async_add_job(self.scene.run())
yield from self.scene.run()
3 changes: 0 additions & 3 deletions homeassistant/components/velux.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,13 @@ class VeluxModule:
def __init__(self, hass, config):
"""Initialize for velux component."""
from pyvlx import PyVLX
self.initialized = False
host = config[DOMAIN].get(CONF_HOST)
password = config[DOMAIN].get(CONF_PASSWORD)
self.pyvlx = PyVLX(
host=host,
password=password)
self.hass = hass

@asyncio.coroutine
def async_start(self):
"""Start velux component."""
yield from self.pyvlx.load_scenes()
self.initialized = True

0 comments on commit f25d56d

Please sign in to comment.