Revert "Made code pep8 compliant once again"

This reverts commit c0ad5ce2d7.

hue_cmd.py

@@ -3,12 +3,10 @@
 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
 
-
 if __name__ == "__main__":
 	init()

modules/configloader/__init__.py

@@ -0,0 +1 @@
+

modules/configloader/loader.py

@@ -1,6 +1,5 @@
 import json
 
-
 def readconfig(path):
 	try:
 		with open(path) as cfg:

modules/hue/hue_controller.py

@@ -17,11 +17,9 @@ PRE_URL = ""  # prefix
 
 loop = asyncio.get_event_loop() # ASync loop
 
-
 def genUrl(params: str):
 	return PRE_URL + params
 
-
 class APIrequest:
 	# Get Req
 	async def get( dest: str="", payload: str="" ):
@@ -71,8 +69,7 @@ class controller:
 
 	async def setLightRGB( index: int, r:int, g:int, b:int ):
 		h, s, v = rgbToHsv(r, g, b)
-        payload = '{"sat":' + str(s) + ', "bri":' + \
+		payload = '{"sat":' + str(s) + ', "bri":' + str(v) + ', "hue":' + str(h) + '}'
-            str(v) + ', "hue":' + str(h) + '}'
 
 		await APIrequest.put( "/lights/" + str(index) + "/state", payload )
 
@@ -82,8 +79,7 @@ class controller:
 		if(key):
 			if( key.get("state") ):
 				curPower = LIGHTS[str(index)]["state"]["on"]
-                loop.run_until_complete(
+				loop.run_until_complete( controller.toggleLight(index, not curPower))
-                    controller.toggleLight(index, not curPower))
 		else:
 			print("Error: Light index '" + str(index) + "' out of range")
 
@@ -101,8 +97,7 @@ class controller:
 	def setLightBrightness( index:int, b:int ):
 		if( LIGHTS.get(str(index)) ):
 			payload = '{"bri":' + str(b) + '}'
-            loop.run_until_complete(APIrequest.put(
+			loop.run_until_complete( APIrequest.put( "/lights/" + str(index) + "/state", payload ) )
-                "/lights/" + str(index) + "/state", payload))
 		else:
 			print("Error: Light index '" + str(index) + "' out of range")
 

modules/hue/hue_remote.py

@@ -7,13 +7,11 @@ from modules.hue import hue_controller as hue  # Actual controller
 
 cmd = "hue"
 
-
 def help():
 	print("--Help page--")
 
 	print( "'" + cmd + "' : Display this help page" )
-    print("'" + cmd + " light (index)' ... : Specify light target, from 1-" +
+	print( "'" + cmd + " light (index)' ... : Specify light target, from 1-" + str(hue.controller.countLights()) )
-          str(hue.controller.countLights()))
 	print( "'" + cmd + " lights' ... : Specify all lights\n" )
 
 	print("--Commands--")
@@ -26,7 +24,6 @@ def help():
 
 	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
@@ -34,7 +31,6 @@ boolConvert = {
 
 # 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" ):
@@ -63,8 +59,7 @@ def parseCommand(cmd: list, pos: int, index=-1, displayHelp=True):
 					r, g, b = int(cmd[pos+2]), int(cmd[pos+3]), int(cmd[pos+4])
 
 					if( index == -1 ):
-                        hue.controller.setAllLightsColor(
+						hue.controller.setAllLightsColor( r, g, b ) # this code is bad
-                            r, g, b)  # this code is bad
 					else:
 						hue.controller.setLightColor( index, r, g, b )
 

modules/hue/lib/func.py

@@ -5,23 +5,18 @@ boolStr = {
     False: "false"
 }
 
-
 def boolToString(v: bool): # To fix the dumb python syntax
     return boolStr[v]
 
-
 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 ):
     R, G, B = rgbToDecimal(r, g, b)
     H, S, V = colorsys.rgb_to_hsv(R, G, B)

modules/speech/speech.py

@@ -1,6 +1,5 @@
 import speech_recognition as sr
 
-
 class voiceInput(object):
 	recognizer = sr.Recognizer()
 
@@ -17,8 +16,7 @@ class voiceInput(object):
 					with sr.Microphone( deviceIndex ) as src:
 						self.recognizer.adjust_for_ambient_noise( src, 0.2 )
 						print("Listening...")
-                        audio = self.recognizer.listen(
+						audio = self.recognizer.listen( src, phrase_time_limit=5 )
-                            src, phrase_time_limit=5)
 						print("Thinking...")
 						text = self.recognizer.recognize_google(audio)
 						yield text
@@ -30,8 +28,10 @@ class voiceInput(object):
 			except sr.UnknownValueError:
 				yield self.what
 
+
 	def setMuted( self, setm: bool=True ):
 		self.muted = setm
 
 	def switchMute( self ):
 		self.setMuted( not self.muted )
+

speech_daemon.py

@@ -13,7 +13,6 @@ homedir = expanduser("~")
 
 CONFIG = {}
 
-
 class speech_daemon(object):
 	voiceInpObj = None
 	deviceIndex = 30
@@ -48,7 +47,6 @@ class speech_daemon(object):
 
 		controller.end()
 
-
 if __name__ == "__main__":
 	daemon = speech_daemon()
 	daemon.loadconfig()