thomas/hass-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formating fixes

Browse Source
This commit is contained in:
Thomas Lovén 2018-12-27 21:54:43 +01:00
parent 951351139e
commit 28ce1522ec
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
appdaemon/apps/base.py
View File

@ -11,11 +11,19 @@ class Timers(Base):
super().initialize() super().initialize()
self._timers = {} self._timers = {}
functions = [ 'run_in', 'run_once', 'run_at', 'run_daily', functions = [
'run_hourly', 'run_minutely', 'run_every', 'run_at_sunrise', 'run_in',
'run_at_sunset' ] 'run_once',
'run_at',
'run_daily',
'run_hourly',
'run_minutely',
'run_every',
'run_at_sunrise',
'run_at_sunset',
]
for f in functions: for f in functions:
self.override(f) self._override(f)
setattr(self, '_cancel_timer', super().cancel_timer) setattr(self, '_cancel_timer', super().cancel_timer)
@ -26,7 +34,7 @@ class Timers(Base):
else: else:
return super().cancel_timer(*args, **kwargs) return super().cancel_timer(*args, **kwargs)
def override(self, f): def _override(self, f):
setattr(self, f'_{f}', getattr(self, f)) setattr(self, f'_{f}', getattr(self, f))
def fn(name, *args, **kwargs): def fn(name, *args, **kwargs):
if type(name) is str: if type(name) is str:
@ -59,16 +67,20 @@ class Entities(Base):
self._hass.listen_state(self._listener, entity=entity, attributes='all') self._hass.listen_state(self._listener, entity=entity, attributes='all')
self._listeners = [] self._listeners = []
def listen(self, callback, kwarg=None):
""" Listen to changes to entity state """
self._listeners.append({
'callback': callback,
'kwarg': kwarg,
})
return self._listeners[-1]
def unlisten(self, handle):
""" Remove state change listener """
if handle in self._listeners:
self._listeners.remove(handle)
def _listener(self, entity, attribute, old, new, kwargs): def _listener(self, entity, attribute, old, new, kwargs):
for l in self._listeners: for l in self._listeners:
l['callback'](l['kwarg']) l['callback'](l['kwarg'])
def listen(self, callback, kwarg=None):
self._listeners.append({'callback': callback, 'kwarg': kwarg})
return self._listeners[-1]
def unlisten(self, handle):
if handle in self._listeners:
self._listeners.remove(handle)
@property @property
def state(self): def state(self):
@ -78,35 +90,41 @@ class Entities(Base):
self._hass.set_state(self._entity, state=state) self._hass.set_state(self._entity, state=state)
def __getattr__(self, key): def __getattr__(self, key):
return self._hass.get_state(self._entity, attribute='all')['attributes'].get(key, None) return self._hass.get_state(self._entity,
attribute='all')['attributes'].get(key, None)
def __setattr__(self, key, value): def __setattr__(self, key, value):
if key.startswith('_'): if key.startswith('_'):
self.__dict__[key] = value self.__dict__[key] = value
return return
d = self._hass.get_state(self._entity, attribute='all')['attributes'] attr = self._hass.get_state(self._entity,
d[key] = value attribute='all')['attributes']
self._hass.set_state(self._entity, attributes=d) attr[key] = value
self._hass.set_state(self._entity, attributes=attr)
def __delattr__(self, key): def __delattr__(self, key):
if key.startswith('_'): if key.startswith('_'):
del self.__dict__[key] del self.__dict__[key]
return return
d = self._hass.get_state(self._entity, attribute='all')['attributes'] attr = self._hass.get_state(self._entity,
d[key] = '' attribute='all')['attributes']
self._hass.set_state(self._entity, attributes=d) attr[key] = ''
self._hass.set_state(self._entity, attributes=attr)
class LightEntity(Entities.Entity): class LightEntity(Entities.Entity):
def __init__(self, hass, entity): def __init__(self, hass, entity):
hass.log("Adding a light")
super().__init__(hass, entity) super().__init__(hass, entity)
@property @property
def state(self): def state(self):
return super().state return super().state
@state.setter @state.setter
def state(self, state): def state(self, state):
if state == 'on': if state == 'on':
self._hass.call_service('light/turn_on', entity_id = self._entity) self._hass.call_service('light/turn_on', entity_id =
self._entity)
elif state == 'off': elif state == 'off':
self._hass.call_service('light/turn_off', entity_id = self._entity) self._hass.call_service('light/turn_off', entity_id =
self._entity)
else: else:
return return
super(Entities.LightEntity, self.__class__).state.fset(self, state) super(Entities.LightEntity, self.__class__).state.fset(self,
state)