elal
/
roomcomputer
mirror of https://github.com/E-Almqvist/roomcomputer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made code pep8 compliant again

Browse Source
pull/3/head
Alve 5 years ago
parent 0f8331af7f
commit 3917c5e65f
8 changed files with 310 additions and 290 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      hue_cmd.py
  2. 1
      modules/configloader/__init__.py
  3. 15
      modules/configloader/loader.py
  4. 299
      modules/hue/hue_controller.py
  5. 135
      modules/hue/hue_remote.py
  6. 11
      modules/hue/lib/func.py
  7. 68
      modules/speech/speech.py
  8. 61
      speech_daemon.py

10
hue_cmd.py
Unescape View File

@ -3,10 +3,12 @@
from modules.hue.hue_controller import controller from modules.hue.hue_controller import controller
from modules.hue.hue_remote import parseCommandline from modules.hue.hue_remote import parseCommandline
def init(): def init():
controller.init() # very important to initialize the controller controller.init() # very important to initialize the controller
parseCommandline() parseCommandline()
controller.end() # also to end it controller.end() # also to end it
if __name__ == "__main__": if __name__ == "__main__":
init() init()

1
modules/configloader/__init__.py
Unescape View File

@ -1 +0,0 @@

15
modules/configloader/loader.py
Unescape View File

@ -1,12 +1,13 @@
import json import json
def readconfig(path): def readconfig(path):
try: try:
with open(path) as cfg: with open(path) as cfg:
data = json.load(cfg) data = json.load(cfg)
return data return data
except: except:
print("[Error] Something went wrong reading the configuration file.") print("[Error] Something went wrong reading the configuration file.")
print("--", path) print("--", path)

299
modules/hue/hue_controller.py
Unescape View File

@ -1,168 +1,173 @@
import requests as req # Used for HTTP requests for the Hue API import requests as req # Used for HTTP requests for the Hue API
import json # API uses JSON import json # API uses JSON
import asyncio # ASync stuff import asyncio # ASync stuff
import time import time
from .lib.func import * # useful functions from .lib.func import * # useful functions
from modules.configloader.loader import readconfig # used to read the config files from modules.configloader.loader import readconfig # used to read the config files
from os.path import expanduser # to get the home dir from os.path import expanduser # to get the home dir
homedir = expanduser("~") # get the home directory of the current user homedir = expanduser("~") # get the home directory of the current user
LIGHTS = {} # dictionary of all the lights LIGHTS = {} # dictionary of all the lights
CONFIG = {} # the configuration CONFIG = {} # the configuration
PRESETS = {} # the presets PRESETS = {} # the presets
PRE_URL = "" # prefix PRE_URL = "" # prefix
loop = asyncio.get_event_loop() # ASync loop
loop = asyncio.get_event_loop() # ASync loop
def genUrl(params: str): def genUrl(params: str):
return PRE_URL + params return PRE_URL + params
class APIrequest: class APIrequest:
# Get Req # Get Req
async def get( dest: str="", payload: str="" ): async def get(dest: str = "", payload: str = ""):
try: try:
apiReq = req.get( genUrl(dest), data = payload ) apiReq = req.get(genUrl(dest), data=payload)
if( apiReq.status_code != 200 ): # print out the error if the status code is not 200 if(apiReq.status_code != 200): # print out the error if the status code is not 200
print(apiReq) print(apiReq)
print(apiReq.text) print(apiReq.text)
return apiReq return apiReq
except req.exceptions.RequestException as err: except req.exceptions.RequestException as err:
print(err) print(err)
# PUT Req # PUT Req
async def put( dest: str="", payload: str="" ): async def put(dest: str = "", payload: str = ""):
try: try:
apiReq = req.put( genUrl(dest), data = payload ) # send the payload apiReq = req.put(genUrl(dest), data=payload) # send the payload
if( apiReq.status_code != 200 ): if(apiReq.status_code != 200):
print(apiReq) print(apiReq)
print(apiReq.text) print(apiReq.text)
return apiReq return apiReq
except req.exceptions.RequestException as err: except req.exceptions.RequestException as err:
print(err) print(err)
class controller: class controller:
# Internal get functions # Internal get functions
async def getLights(): async def getLights():
return await APIrequest.get("/lights") return await APIrequest.get("/lights")
async def getLight(index: int=1): async def getLight(index: int = 1):
return await APIrequest.get( "/lights/" + str(index) ) return await APIrequest.get("/lights/" + str(index))
# Lower level light manipulation (async) # Lower level light manipulation (async)
async def toggleLight(index: int=1, isOn: bool=True): async def toggleLight(index: int = 1, isOn: bool = True):
await APIrequest.put( "/lights/" + str(index) + "/state", '{"on":' + boolToString(isOn) + '}' ) await APIrequest.put("/lights/" + str(index) + "/state", '{"on":' + boolToString(isOn) + '}')
async def toggleLights(isOn: bool=True): async def toggleLights(isOn: bool = True):
for key in LIGHTS: for key in LIGHTS:
await controller.toggleLight(key, isOn) await controller.toggleLight(key, isOn)
async def setLightRGB( index: int, r:int, g:int, b:int ): async def setLightRGB(index: int, r: int, g: int, b: int):
h, s, v = rgbToHsv(r, g, b) h, s, v = rgbToHsv(r, g, b)
payload = '{"sat":' + str(s) + ', "bri":' + str(v) + ', "hue":' + str(h) + '}' payload = '{"sat":' + str(s) + ', "bri":' + \
str(v) + ', "hue":' + str(h) + '}'
await APIrequest.put( "/lights/" + str(index) + "/state", payload )
await APIrequest.put("/lights/" + str(index) + "/state", payload)
# Normal functions
def switchLight( index: int=1 ): # Normal functions
key = LIGHTS.get(str(index)) def switchLight(index: int = 1):
if(key): key = LIGHTS.get(str(index))
if( key.get("state") ): if(key):
curPower = LIGHTS[str(index)]["state"]["on"] if(key.get("state")):
loop.run_until_complete( controller.toggleLight(index, not curPower)) curPower = LIGHTS[str(index)]["state"]["on"]
else: loop.run_until_complete(
print("Error: Light index '" + str(index) + "' out of range") controller.toggleLight(index, not curPower))
else:
def switchLights(): print("Error: Light index '" + str(index) + "' out of range")
for key in LIGHTS:
controller.switchLight(key) def switchLights():
for key in LIGHTS:
# Light control controller.switchLight(key)
def setLightColor( index:int, r:int, g:int, b:int ):
if( LIGHTS.get(str(index)) ): # Light control
loop.run_until_complete( controller.setLightRGB(index, r, g, b) ) def setLightColor(index: int, r: int, g: int, b: int):
else: if(LIGHTS.get(str(index))):
print("Error: Light index '" + str(index) + "' out of range") loop.run_until_complete(controller.setLightRGB(index, r, g, b))
else:
def setLightBrightness( index:int, b:int ): print("Error: Light index '" + str(index) + "' out of range")
if( LIGHTS.get(str(index)) ):
payload = '{"bri":' + str(b) + '}' def setLightBrightness(index: int, b: int):
loop.run_until_complete( APIrequest.put( "/lights/" + str(index) + "/state", payload ) ) if(LIGHTS.get(str(index))):
else: payload = '{"bri":' + str(b) + '}'
print("Error: Light index '" + str(index) + "' out of range") loop.run_until_complete(APIrequest.put(
"/lights/" + str(index) + "/state", payload))
def setBrightness( b:int ): else:
for key in LIGHTS: print("Error: Light index '" + str(index) + "' out of range")
controller.setLightBrightness( key, b )
def setBrightness(b: int):
def setAllLightsColor( r:int, g:int, b:int ): for key in LIGHTS:
for key in LIGHTS: controller.setLightBrightness(key, b)
controller.setLightColor( key, r, g, b )
def setAllLightsColor(r: int, g: int, b: int):
def Power(isOn:bool=True): # Controlling the power of the lights for key in LIGHTS:
loop.run_until_complete( controller.toggleLights(isOn) ) controller.setLightColor(key, r, g, b)
def powerLight( index:int, isOn:bool=True ): def Power(isOn: bool = True): # Controlling the power of the lights
loop.run_until_complete( controller.toggleLight( index, isOn ) ) loop.run_until_complete(controller.toggleLights(isOn))
# Presets def powerLight(index: int, isOn: bool = True):
def setLightPreset( index:int, p:str ): loop.run_until_complete(controller.toggleLight(index, isOn))
if( LIGHTS.get(str(index)) ):
if( PRESETS.get(p) ): # Presets
preset = PRESETS[p] def setLightPreset(index: int, p: str):
r, g, b = preset["color"] if(LIGHTS.get(str(index))):
brightness = preset["brightness"] if(PRESETS.get(p)):
preset = PRESETS[p]
controller.setLightColor( index, r, g, b ) r, g, b = preset["color"]
controller.setLightBrightness( index, brightness ) brightness = preset["brightness"]
else:
print("Error: Unknown preset '" + p + "'") controller.setLightColor(index, r, g, b)
else: controller.setLightBrightness(index, brightness)
print("Error: Light index '" + str(index) + "' out of range") else:
print("Error: Unknown preset '" + p + "'")
def setPreset( presetID:str, index:int=-1 ): else:
if( PRESETS.get(presetID) ): print("Error: Light index '" + str(index) + "' out of range")
if( index == -1 ):
for key in LIGHTS: def setPreset(presetID: str, index: int = -1):
controller.setLightPreset( key, presetID ) if(PRESETS.get(presetID)):
else: if(index == -1):
controller.setLightPreset( index, presetID ) for key in LIGHTS:
else: controller.setLightPreset(key, presetID)
print("Error: Unknown preset '" + presetID + "'") else:
controller.setLightPreset(index, presetID)
def countLights(): else:
return len(LIGHTS) print("Error: Unknown preset '" + presetID + "'")
# Controller "system" functions def countLights():
def delay(n:int): return len(LIGHTS)
time.sleep(n)
# Controller "system" functions
def init( cfgPath="{0}/.config/roomcomputer/config.json".format(homedir), presetPath="{0}/.config/roomcomputer/presets.json".format(homedir) ): def delay(n: int):
config = readconfig(cfgPath) time.sleep(n)
presets = readconfig(presetPath)
def init(cfgPath="{0}/.config/roomcomputer/config.json".format(homedir), presetPath="{0}/.config/roomcomputer/presets.json".format(homedir)):
global CONFIG config = readconfig(cfgPath)
CONFIG = config["hue"] presets = readconfig(presetPath)
global PRESETS global CONFIG
PRESETS = presets CONFIG = config["hue"]
global PRE_URL global PRESETS
PRE_URL = "http://" + CONFIG["address"] + "/api/" + CONFIG["username"] PRESETS = presets
jsonLights = loop.run_until_complete(APIrequest.get("/lights")) global PRE_URL
global LIGHTS PRE_URL = "http://" + CONFIG["address"] + "/api/" + CONFIG["username"]
LIGHTS = json.loads(jsonLights.text)
jsonLights = loop.run_until_complete(APIrequest.get("/lights"))
def end(): global LIGHTS
loop.close() LIGHTS = json.loads(jsonLights.text)
def end():
loop.close()

135
modules/hue/hue_remote.py
Unescape View File

@ -3,96 +3,101 @@
import sys import sys
from modules.hue import hue_controller as hue # Actual controller from modules.hue import hue_controller as hue # Actual controller
cmd = "hue" cmd = "hue"
def help(): def help():
print("--Help page--") print("--Help page--")
print("'" + cmd + "' : Display this help page")
print("'" + cmd + " light (index)' ... : Specify light target, from 1-" +
str(hue.controller.countLights()))
print("'" + cmd + " lights' ... : Specify all lights\n")
print( "'" + cmd + "' : Display this help page" ) print("--Commands--")
print( "'" + cmd + " light (index)' ... : Specify light target, from 1-" + str(hue.controller.countLights()) ) print("'on'/'off' : Turn light(s) on/off")
print( "'" + cmd + " lights' ... : Specify all lights\n" ) print("'switch' : Switch the light(s) power")
print("'set ...'")
print(" 'preset (preset ID)' : Set the preset (from presets.py)")
print(" 'color (red) (green) (blue)' : Set the color, from 0-255")
print(" 'brightness (brightness)' : Set the brightness, from 0-255")
print("--Commands--") print("\nExamples:\n'hue light 2 on' : Turn on light 2\n'hue lights set color 255 255 255' : Set all lights colors to white")
print( "'on'/'off' : Turn light(s) on/off" )
print( "'switch' : Switch the light(s) power" )
print( "'set ...'" )
print( " 'preset (preset ID)' : Set the preset (from presets.py)" )
print( " 'color (red) (green) (blue)' : Set the color, from 0-255" )
print( " 'brightness (brightness)' : Set the brightness, from 0-255" )
print("\nExamples:\n'hue light 2 on' : Turn on light 2\n'hue lights set color 255 255 255' : Set all lights colors to white")
boolConvert = { boolConvert = {
"on": True, "on": True,
"off": False "off": False
} }
# this is the most spaghetti-ish code I have ever written but it works # this is the most spaghetti-ish code I have ever written but it works
def parseCommand( cmd:list, pos:int, index=-1, displayHelp=True ):
try:
if( cmd[pos] == "on" or cmd[pos] == "off" ):
if( index == -1 ):
hue.controller.Power( boolConvert[cmd[pos]] )
else:
hue.controller.powerLight( index, boolConvert[cmd[pos]] )
return def parseCommand(cmd: list, pos: int, index=-1, displayHelp=True):
try:
if(cmd[pos] == "on" or cmd[pos] == "off"):
if(index == -1):
hue.controller.Power(boolConvert[cmd[pos]])
else:
hue.controller.powerLight(index, boolConvert[cmd[pos]])
return
elif( cmd[pos] == "switch" ): elif(cmd[pos] == "switch"):
if(index == -1): if(index == -1):
hue.controller.switchLights() hue.controller.switchLights()
else: else:
hue.controller.switchLight(index) hue.controller.switchLight(index)
return return
elif( cmd[pos] == "set" ): elif(cmd[pos] == "set"):
if( cmd[pos+1] == "preset" ): if(cmd[pos+1] == "preset"):
hue.controller.setPreset( cmd[pos+2], index ) hue.controller.setPreset(cmd[pos+2], index)
return return
elif( cmd[pos+1] == "color" ): elif(cmd[pos+1] == "color"):
if( len(cmd) > pos+4 ): if(len(cmd) > pos+4):
r, g, b = int(cmd[pos+2]), int(cmd[pos+3]), int(cmd[pos+4]) r, g, b = int(cmd[pos+2]), int(cmd[pos+3]), int(cmd[pos+4])
if( index == -1 ): if(index == -1):
hue.controller.setAllLightsColor( r, g, b ) # this code is bad hue.controller.setAllLightsColor(
else: r, g, b) # this code is bad
hue.controller.setLightColor( index, r, g, b ) else:
hue.controller.setLightColor(index, r, g, b)
return return
else: else:
print("Error: Missing parameters") print("Error: Missing parameters")
help() help()
elif( cmd[pos+1] == "brightness" ): elif(cmd[pos+1] == "brightness"):
if( len(cmd) > pos+2 ): if(len(cmd) > pos+2):
bri = int(cmd[pos+2]) bri = int(cmd[pos+2])
if( index == -1 ): if(index == -1):
hue.controller.setBrightness(bri) hue.controller.setBrightness(bri)
else: else:
hue.controller.setLightBrightness( index, bri ) hue.controller.setLightBrightness(index, bri)
return return
help() # display help if function did nothing help() # display help if function did nothing
except (RuntimeError, TypeError, NameError, IndexError) as err: except (RuntimeError, TypeError, NameError, IndexError) as err:
if(displayHelp): if(displayHelp):
help() # display the help page if parameters are missing (it will give out an IndexError) help() # display the help page if parameters are missing (it will give out an IndexError)
print( "\n\nError: " + str(err) ) print("\n\nError: " + str(err))
def parseCommandline( cmd=sys.argv, needHelp=True ): def parseCommandline(cmd=sys.argv, needHelp=True):
if( len(cmd) > 1 ): if(len(cmd) > 1):
if( cmd[1] == "light" ): if(cmd[1] == "light"):
parseCommand( cmd, 3, cmd[2], displayHelp=needHelp ) parseCommand(cmd, 3, cmd[2], displayHelp=needHelp)
elif( cmd[1] == "lights" ): elif(cmd[1] == "lights"):
parseCommand( cmd, 2, displayHelp=needHelp ) parseCommand(cmd, 2, displayHelp=needHelp)
elif( needHelp ): elif(needHelp):
help() help()

11
modules/hue/lib/func.py
Unescape View File

@ -5,19 +5,24 @@ boolStr = {
False: "false" False: "false"
} }
def boolToString(v: bool): # To fix the dumb python syntax
def boolToString(v: bool): # To fix the dumb python syntax
return boolStr[v] return boolStr[v]
def rgbToDecimal( r:int, g:int, b:int ):
def rgbToDecimal(r: int, g: int, b: int):
return round(r/255, 1), round(g/255, 1), round(b/255, 1) return round(r/255, 1), round(g/255, 1), round(b/255, 1)
def svNumFix(n: float): def svNumFix(n: float):
return int(round(n*254, 0)) return int(round(n*254, 0))
def hueNumFix(n: float): def hueNumFix(n: float):
return int(round(n*65535, 0)) return int(round(n*65535, 0))
def rgbToHsv( r:int, g:int, b:int ):
def rgbToHsv(r: int, g: int, b: int):
R, G, B = rgbToDecimal(r, g, b) R, G, B = rgbToDecimal(r, g, b)
H, S, V = colorsys.rgb_to_hsv(R, G, B) H, S, V = colorsys.rgb_to_hsv(R, G, B)
return hueNumFix(H), svNumFix(S), svNumFix(V) return hueNumFix(H), svNumFix(S), svNumFix(V)

68
modules/speech/speech.py
Unescape View File

@ -1,37 +1,37 @@
import speech_recognition as sr import speech_recognition as sr
class voiceInput(object):
recognizer = sr.Recognizer()
muted = True
# "Error codes", can be used to check stuff
what = "??"
error = "ERROR"
def start( self, deviceIndex=None ): # a generator for everything that is said
while( True ): # loop
try:
if( not self.muted ): # this thing is not the NSA
with sr.Microphone( deviceIndex ) as src:
self.recognizer.adjust_for_ambient_noise( src, 0.2 )
print("Listening...")
audio = self.recognizer.listen( src, phrase_time_limit=5 )
print("Thinking...")
text = self.recognizer.recognize_google(audio)
yield text
except sr.RequestError as err:
print("Unable to request results: {0}".format(err))
yield self.error
except sr.UnknownValueError:
yield self.what
def setMuted( self, setm: bool=True ):
self.muted = setm
def switchMute( self ):
self.setMuted( not self.muted )
class voiceInput(object):
recognizer = sr.Recognizer()
muted = True
# "Error codes", can be used to check stuff
what = "??"
error = "ERROR"
def start(self, deviceIndex=None): # a generator for everything that is said
while(True): # loop
try:
if(not self.muted): # this thing is not the NSA
with sr.Microphone(deviceIndex) as src:
self.recognizer.adjust_for_ambient_noise(src, 0.2)
print("Listening...")
audio = self.recognizer.listen(
src, phrase_time_limit=5)
print("Thinking...")
text = self.recognizer.recognize_google(audio)
yield text
except sr.RequestError as err:
print("Unable to request results: {0}".format(err))
yield self.error
except sr.UnknownValueError:
yield self.what
def setMuted(self, setm: bool = True):
self.muted = setm
def switchMute(self):
self.setMuted(not self.muted)

61
speech_daemon.py
Unescape View File

@ -13,44 +13,47 @@ homedir = expanduser("~")
CONFIG = {} CONFIG = {}
class speech_daemon(object): class speech_daemon(object):
voiceInpObj = None voiceInpObj = None
deviceIndex = None deviceIndex = None
def __init__(self):
self.voiceInpObj = voiceInput()
self.voiceInpObj.setMuted(False)
def __init__(self): def loadconfig(self):
self.voiceInpObj = voiceInput() path = homedir + "/.config/roomcomputer/config.json"
self.voiceInpObj.setMuted(False) # if no config path is
# specified then choose the users default
def loadconfig(self): if(len(sys.argv) > 1):
path = homedir + "/.config/roomcomputer/config.json" path = sys.argv[1]
# if no config path is
# specified then choose the users default
if( len(sys.argv) > 1 ): cfg = readconfig(path) # read the config
path = sys.argv[1]
cfg = readconfig(path) # read the config global CONFIG
CONFIG = cfg
global CONFIG # Apply the device index
CONFIG = cfg self.deviceIndex = CONFIG["speech"]["device_index"]
self.deviceIndex = CONFIG["speech"]["device_index"] # Apply the device index def start(self):
controller.init()
def start(self): for inp in self.voiceInpObj.start(self.deviceIndex):
controller.init() if(inp != self.voiceInpObj.error and inp != self.voiceInpObj.what):
cmdBuf = inp.lower().split(" ")
if(cmdBuf[0] in CONFIG["speech"]["prefixes"]):
print("CMD:", cmdBuf)
parseCommandline(cmdBuf, False)
else:
print("Error/What: {0}".format(inp))
for inp in self.voiceInpObj.start( self.deviceIndex ): controller.end()
if( inp != self.voiceInpObj.error and inp != self.voiceInpObj.what ):
cmdBuf = inp.lower().split(" ")
if( cmdBuf[0] in CONFIG["speech"]["prefixes"] ):
print("CMD:", cmdBuf)
parseCommandline( cmdBuf, False )
else:
print("Error/What: {0}".format(inp))
controller.end()
if __name__ == "__main__": if __name__ == "__main__":
daemon = speech_daemon() daemon = speech_daemon()
daemon.loadconfig() daemon.loadconfig()
daemon.start() daemon.start()

Write Preview
Loading…
Cancel
Save