saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Separate device (lamps) getter

Browse source
This commit is contained in:
Bo Maryniuk 2015-10-13 01:40:01 +02:00 • committed by C. R. Oldham
parent 37ed834a63
commit e0c95b4c7f
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
salt/proxy/philips_hue.py
View file

@ -134,12 +134,28 @@ def _get_devices(params):
or [int(dev) for dev in params['id'].split(",")]
def _get_lights():
'''
Get all available lighting devices.
:return:
'''
return json.loads(requests.get(CONFIG['url'] + "/lights").content)
# Callers
def call_lights(*args, **kwargs):
'''
Get info about available lamps.
'''
return json.loads(requests.get(CONFIG['url'] + "/lights").content)
res = dict()
lights = _get_lights()
if 'id' in kwargs:
for dev_id in _get_devices(kwargs):
if lights.get(str(dev_id)):
res[dev_id] = lights[str(dev_id)]
return res or False
def call_switch(*args, **kwargs):
@ -163,7 +179,7 @@ def call_switch(*args, **kwargs):
salt '*' hue.switch id=1,2,3 on=True
'''
out = dict()
devices = call_lights()
devices = _get_lights()
for dev_id in ('id' not in kwargs and sorted(devices.keys()) or _get_devices(kwargs)):
if 'on' in kwargs:
state = kwargs['on'] and Const.LAMP_ON or Const.LAMP_OFF
@ -191,7 +207,7 @@ def call_blink(*args, **kwargs):
salt '*' hue.blink id=1
salt '*' hue.blink id=1,2,3
'''
devices = call_lights()
devices = _get_lights()
pause = kwargs.get('pause', 0)
res = dict()
for dev_id in ('id' not in kwargs and sorted(devices.keys()) or _get_devices(kwargs)):
@ -215,12 +231,13 @@ def call_ping(*args, **kwargs):
return errors or True
def call_status(*args, **kwargs):
'''
Return the status of the lamps.
'''
res = dict()
devices = call_lights()
devices = _get_devices()
for dev_id in devices:
res[dev_id] = {
'on': devices[dev_id]['state']['on'],