From 3917c5e65f160e90c6faae670305e515ea417a7d Mon Sep 17 00:00:00 2001 From: Alve Date: Mon, 12 Oct 2020 11:13:17 +0200 Subject: [PATCH] Made code pep8 compliant again --- hue_cmd.py | 10 +- modules/configloader/__init__.py | 1 - modules/configloader/loader.py | 15 +- modules/hue/hue_controller.py | 299 ++++++++++++++++--------------- modules/hue/hue_remote.py | 135 +++++++------- modules/hue/lib/func.py | 11 +- modules/speech/speech.py | 68 +++---- speech_daemon.py | 61 ++++--- 8 files changed, 310 insertions(+), 290 deletions(-) diff --git a/hue_cmd.py b/hue_cmd.py index 8a048b9..63aad12 100755 --- a/hue_cmd.py +++ b/hue_cmd.py @@ -3,10 +3,12 @@ from modules.hue.hue_controller import controller from modules.hue.hue_remote import parseCommandline + def init(): - controller.init() # very important to initialize the controller - parseCommandline() - controller.end() # also to end it + controller.init() # very important to initialize the controller + parseCommandline() + controller.end() # also to end it + if __name__ == "__main__": - init() + init() diff --git a/modules/configloader/__init__.py b/modules/configloader/__init__.py index 8b13789..e69de29 100644 --- a/modules/configloader/__init__.py +++ b/modules/configloader/__init__.py @@ -1 +0,0 @@ - diff --git a/modules/configloader/loader.py b/modules/configloader/loader.py index 87617db..b6e3839 100644 --- a/modules/configloader/loader.py +++ b/modules/configloader/loader.py @@ -1,12 +1,13 @@ import json + def readconfig(path): - try: - with open(path) as cfg: - data = json.load(cfg) + try: + with open(path) as cfg: + data = json.load(cfg) - return data + return data - except: - print("[Error] Something went wrong reading the configuration file.") - print("--", path) + except: + print("[Error] Something went wrong reading the configuration file.") + print("--", path) diff --git a/modules/hue/hue_controller.py b/modules/hue/hue_controller.py index bbc1b4a..4e77c06 100644 --- a/modules/hue/hue_controller.py +++ b/modules/hue/hue_controller.py @@ -1,168 +1,173 @@ -import requests as req # Used for HTTP requests for the Hue API -import json # API uses JSON -import asyncio # ASync stuff +import requests as req # Used for HTTP requests for the Hue API +import json # API uses JSON +import asyncio # ASync stuff 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 os.path import expanduser # to get the home dir +from modules.configloader.loader import readconfig # used to read the config files +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 -CONFIG = {} # the configuration -PRESETS = {} # the presets -PRE_URL = "" # prefix +LIGHTS = {} # dictionary of all the lights +CONFIG = {} # the configuration +PRESETS = {} # the presets +PRE_URL = "" # prefix + +loop = asyncio.get_event_loop() # ASync loop -loop = asyncio.get_event_loop() # ASync loop def genUrl(params: str): - return PRE_URL + params + return PRE_URL + params + class APIrequest: - # Get Req - async def get( dest: str="", payload: str="" ): - try: - apiReq = req.get( genUrl(dest), data = payload ) + # Get Req + async def get(dest: str = "", payload: str = ""): + try: + apiReq = req.get(genUrl(dest), data=payload) - if( apiReq.status_code != 200 ): # print out the error if the status code is not 200 - print(apiReq) - print(apiReq.text) + if(apiReq.status_code != 200): # print out the error if the status code is not 200 + print(apiReq) + print(apiReq.text) - return apiReq + return apiReq - except req.exceptions.RequestException as err: - print(err) + except req.exceptions.RequestException as err: + print(err) - # PUT Req - async def put( dest: str="", payload: str="" ): - try: - apiReq = req.put( genUrl(dest), data = payload ) # send the payload + # PUT Req + async def put(dest: str = "", payload: str = ""): + try: + apiReq = req.put(genUrl(dest), data=payload) # send the payload - if( apiReq.status_code != 200 ): - print(apiReq) - print(apiReq.text) + if(apiReq.status_code != 200): + print(apiReq) + print(apiReq.text) - return apiReq + return apiReq - except req.exceptions.RequestException as err: - print(err) + except req.exceptions.RequestException as err: + print(err) class controller: - # Internal get functions - async def getLights(): - return await APIrequest.get("/lights") - - async def getLight(index: int=1): - return await APIrequest.get( "/lights/" + str(index) ) - - # Lower level light manipulation (async) - async def toggleLight(index: int=1, isOn: bool=True): - await APIrequest.put( "/lights/" + str(index) + "/state", '{"on":' + boolToString(isOn) + '}' ) - - async def toggleLights(isOn: bool=True): - for key in LIGHTS: - await controller.toggleLight(key, isOn) - - async def setLightRGB( index: int, r:int, g:int, b:int ): - h, s, v = rgbToHsv(r, g, b) - payload = '{"sat":' + str(s) + ', "bri":' + str(v) + ', "hue":' + str(h) + '}' - - await APIrequest.put( "/lights/" + str(index) + "/state", payload ) - - # Normal functions - def switchLight( index: int=1 ): - key = LIGHTS.get(str(index)) - if(key): - if( key.get("state") ): - curPower = LIGHTS[str(index)]["state"]["on"] - loop.run_until_complete( controller.toggleLight(index, not curPower)) - else: - print("Error: Light index '" + str(index) + "' out of range") - - def switchLights(): - for key in LIGHTS: - controller.switchLight(key) - - # Light control - def setLightColor( index:int, r:int, g:int, b:int ): - if( LIGHTS.get(str(index)) ): - loop.run_until_complete( controller.setLightRGB(index, r, g, b) ) - else: - print("Error: Light index '" + str(index) + "' out of range") - - def setLightBrightness( index:int, b:int ): - if( LIGHTS.get(str(index)) ): - payload = '{"bri":' + str(b) + '}' - loop.run_until_complete( APIrequest.put( "/lights/" + str(index) + "/state", payload ) ) - else: - print("Error: Light index '" + str(index) + "' out of range") - - def setBrightness( b:int ): - for key in LIGHTS: - controller.setLightBrightness( key, b ) - - def setAllLightsColor( r:int, g:int, b:int ): - for key in LIGHTS: - controller.setLightColor( key, r, g, b ) - - def Power(isOn:bool=True): # Controlling the power of the lights - loop.run_until_complete( controller.toggleLights(isOn) ) - - def powerLight( index:int, isOn:bool=True ): - loop.run_until_complete( controller.toggleLight( index, isOn ) ) - - # Presets - def setLightPreset( index:int, p:str ): - if( LIGHTS.get(str(index)) ): - if( PRESETS.get(p) ): - preset = PRESETS[p] - r, g, b = preset["color"] - brightness = preset["brightness"] - - controller.setLightColor( index, r, g, b ) - controller.setLightBrightness( index, brightness ) - else: - print("Error: Unknown preset '" + p + "'") - else: - print("Error: Light index '" + str(index) + "' out of range") - - def setPreset( presetID:str, index:int=-1 ): - if( PRESETS.get(presetID) ): - if( index == -1 ): - for key in LIGHTS: - controller.setLightPreset( key, presetID ) - else: - controller.setLightPreset( index, presetID ) - else: - print("Error: Unknown preset '" + presetID + "'") - - def countLights(): - return len(LIGHTS) - - # Controller "system" functions - def delay(n:int): - time.sleep(n) - - def init( cfgPath="{0}/.config/roomcomputer/config.json".format(homedir), presetPath="{0}/.config/roomcomputer/presets.json".format(homedir) ): - config = readconfig(cfgPath) - presets = readconfig(presetPath) - - global CONFIG - CONFIG = config["hue"] - - global PRESETS - PRESETS = presets - - global PRE_URL - PRE_URL = "http://" + CONFIG["address"] + "/api/" + CONFIG["username"] - - jsonLights = loop.run_until_complete(APIrequest.get("/lights")) - global LIGHTS - LIGHTS = json.loads(jsonLights.text) - - def end(): - loop.close() + # Internal get functions + async def getLights(): + return await APIrequest.get("/lights") + + async def getLight(index: int = 1): + return await APIrequest.get("/lights/" + str(index)) + + # Lower level light manipulation (async) + async def toggleLight(index: int = 1, isOn: bool = True): + await APIrequest.put("/lights/" + str(index) + "/state", '{"on":' + boolToString(isOn) + '}') + + async def toggleLights(isOn: bool = True): + for key in LIGHTS: + await controller.toggleLight(key, isOn) + + async def setLightRGB(index: int, r: int, g: int, b: int): + h, s, v = rgbToHsv(r, g, b) + payload = '{"sat":' + str(s) + ', "bri":' + \ + str(v) + ', "hue":' + str(h) + '}' + + await APIrequest.put("/lights/" + str(index) + "/state", payload) + + # Normal functions + def switchLight(index: int = 1): + key = LIGHTS.get(str(index)) + if(key): + if(key.get("state")): + curPower = LIGHTS[str(index)]["state"]["on"] + loop.run_until_complete( + controller.toggleLight(index, not curPower)) + else: + print("Error: Light index '" + str(index) + "' out of range") + + def switchLights(): + for key in LIGHTS: + controller.switchLight(key) + + # Light control + def setLightColor(index: int, r: int, g: int, b: int): + if(LIGHTS.get(str(index))): + loop.run_until_complete(controller.setLightRGB(index, r, g, b)) + else: + print("Error: Light index '" + str(index) + "' out of range") + + def setLightBrightness(index: int, b: int): + if(LIGHTS.get(str(index))): + payload = '{"bri":' + str(b) + '}' + loop.run_until_complete(APIrequest.put( + "/lights/" + str(index) + "/state", payload)) + else: + print("Error: Light index '" + str(index) + "' out of range") + + def setBrightness(b: int): + for key in LIGHTS: + controller.setLightBrightness(key, b) + + def setAllLightsColor(r: int, g: int, b: int): + for key in LIGHTS: + controller.setLightColor(key, r, g, b) + + def Power(isOn: bool = True): # Controlling the power of the lights + loop.run_until_complete(controller.toggleLights(isOn)) + + def powerLight(index: int, isOn: bool = True): + loop.run_until_complete(controller.toggleLight(index, isOn)) + + # Presets + def setLightPreset(index: int, p: str): + if(LIGHTS.get(str(index))): + if(PRESETS.get(p)): + preset = PRESETS[p] + r, g, b = preset["color"] + brightness = preset["brightness"] + + controller.setLightColor(index, r, g, b) + controller.setLightBrightness(index, brightness) + else: + print("Error: Unknown preset '" + p + "'") + else: + print("Error: Light index '" + str(index) + "' out of range") + + def setPreset(presetID: str, index: int = -1): + if(PRESETS.get(presetID)): + if(index == -1): + for key in LIGHTS: + controller.setLightPreset(key, presetID) + else: + controller.setLightPreset(index, presetID) + else: + print("Error: Unknown preset '" + presetID + "'") + + def countLights(): + return len(LIGHTS) + + # Controller "system" functions + def delay(n: int): + time.sleep(n) + + def init(cfgPath="{0}/.config/roomcomputer/config.json".format(homedir), presetPath="{0}/.config/roomcomputer/presets.json".format(homedir)): + config = readconfig(cfgPath) + presets = readconfig(presetPath) + + global CONFIG + CONFIG = config["hue"] + + global PRESETS + PRESETS = presets + + global PRE_URL + PRE_URL = "http://" + CONFIG["address"] + "/api/" + CONFIG["username"] + + jsonLights = loop.run_until_complete(APIrequest.get("/lights")) + global LIGHTS + LIGHTS = json.loads(jsonLights.text) + + def end(): + loop.close() diff --git a/modules/hue/hue_remote.py b/modules/hue/hue_remote.py index fc81abd..685d840 100755 --- a/modules/hue/hue_remote.py +++ b/modules/hue/hue_remote.py @@ -3,96 +3,101 @@ import sys -from modules.hue import hue_controller as hue # Actual controller +from modules.hue import hue_controller as hue # Actual controller cmd = "hue" + 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( "'" + cmd + " light (index)' ... : Specify light target, from 1-" + str(hue.controller.countLights()) ) - print( "'" + cmd + " lights' ... : Specify all lights\n" ) + print("--Commands--") + 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("--Commands--") - 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") - 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 = { - "on": True, - "off": False + "on": True, + "off": False } # 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" ): - if(index == -1): - hue.controller.switchLights() - else: - hue.controller.switchLight(index) + elif(cmd[pos] == "switch"): + if(index == -1): + hue.controller.switchLights() + else: + hue.controller.switchLight(index) - return + return - elif( cmd[pos] == "set" ): - if( cmd[pos+1] == "preset" ): - hue.controller.setPreset( cmd[pos+2], index ) - return + elif(cmd[pos] == "set"): + if(cmd[pos+1] == "preset"): + hue.controller.setPreset(cmd[pos+2], index) + return - elif( cmd[pos+1] == "color" ): - if( len(cmd) > pos+4 ): - r, g, b = int(cmd[pos+2]), int(cmd[pos+3]), int(cmd[pos+4]) + elif(cmd[pos+1] == "color"): + if(len(cmd) > pos+4): + r, g, b = int(cmd[pos+2]), int(cmd[pos+3]), int(cmd[pos+4]) - if( index == -1 ): - hue.controller.setAllLightsColor( r, g, b ) # this code is bad - else: - hue.controller.setLightColor( index, r, g, b ) + if(index == -1): + hue.controller.setAllLightsColor( + r, g, b) # this code is bad + else: + hue.controller.setLightColor(index, r, g, b) - return - else: - print("Error: Missing parameters") - help() + return + else: + print("Error: Missing parameters") + help() - elif( cmd[pos+1] == "brightness" ): - if( len(cmd) > pos+2 ): - bri = int(cmd[pos+2]) + elif(cmd[pos+1] == "brightness"): + if(len(cmd) > pos+2): + bri = int(cmd[pos+2]) - if( index == -1 ): - hue.controller.setBrightness(bri) - else: - hue.controller.setLightBrightness( index, bri ) + if(index == -1): + hue.controller.setBrightness(bri) + else: + hue.controller.setLightBrightness(index, bri) - return - help() # display help if function did nothing + return + help() # display help if function did nothing - except (RuntimeError, TypeError, NameError, IndexError) as err: - if(displayHelp): - help() # display the help page if parameters are missing (it will give out an IndexError) + except (RuntimeError, TypeError, NameError, IndexError) as err: + if(displayHelp): + 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 ): - if( len(cmd) > 1 ): - if( cmd[1] == "light" ): - parseCommand( cmd, 3, cmd[2], displayHelp=needHelp ) +def parseCommandline(cmd=sys.argv, needHelp=True): + if(len(cmd) > 1): + if(cmd[1] == "light"): + parseCommand(cmd, 3, cmd[2], displayHelp=needHelp) - elif( cmd[1] == "lights" ): - parseCommand( cmd, 2, displayHelp=needHelp ) - elif( needHelp ): - help() + elif(cmd[1] == "lights"): + parseCommand(cmd, 2, displayHelp=needHelp) + elif(needHelp): + help() diff --git a/modules/hue/lib/func.py b/modules/hue/lib/func.py index 5495c69..81b8efe 100644 --- a/modules/hue/lib/func.py +++ b/modules/hue/lib/func.py @@ -5,19 +5,24 @@ boolStr = { 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] -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) + def svNumFix(n: float): return int(round(n*254, 0)) + def hueNumFix(n: float): 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) H, S, V = colorsys.rgb_to_hsv(R, G, B) return hueNumFix(H), svNumFix(S), svNumFix(V) diff --git a/modules/speech/speech.py b/modules/speech/speech.py index fd67957..e30722d 100644 --- a/modules/speech/speech.py +++ b/modules/speech/speech.py @@ -1,37 +1,37 @@ 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) diff --git a/speech_daemon.py b/speech_daemon.py index f381b03..e68accf 100755 --- a/speech_daemon.py +++ b/speech_daemon.py @@ -13,44 +13,47 @@ homedir = expanduser("~") CONFIG = {} + class speech_daemon(object): - voiceInpObj = None - deviceIndex = None + voiceInpObj = None + deviceIndex = None + + def __init__(self): + self.voiceInpObj = voiceInput() + self.voiceInpObj.setMuted(False) - def __init__(self): - self.voiceInpObj = voiceInput() - self.voiceInpObj.setMuted(False) + def loadconfig(self): + path = homedir + "/.config/roomcomputer/config.json" + # if no config path is + # specified then choose the users default - def loadconfig(self): - path = homedir + "/.config/roomcomputer/config.json" - # if no config path is - # specified then choose the users default + if(len(sys.argv) > 1): + path = sys.argv[1] - if( len(sys.argv) > 1 ): - path = sys.argv[1] + cfg = readconfig(path) # read the config - cfg = readconfig(path) # read the config + global CONFIG + CONFIG = cfg - global CONFIG - CONFIG = cfg + # Apply the device index + self.deviceIndex = CONFIG["speech"]["device_index"] - self.deviceIndex = CONFIG["speech"]["device_index"] # Apply the device index + def start(self): + controller.init() - def start(self): - controller.init() + for inp in self.voiceInpObj.start(self.deviceIndex): + 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 ): - 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() - controller.end() if __name__ == "__main__": - daemon = speech_daemon() - daemon.loadconfig() - daemon.start() + daemon = speech_daemon() + daemon.loadconfig() + daemon.start()