From 4741960c9c281a682e0e59737cdd54a3bb2f1270 Mon Sep 17 00:00:00 2001
From: simon <github@simonzeyer.de>
Date: Sat, 29 Dec 2018 19:28:04 +0100
Subject: [PATCH] rename jsonHandler to helper, since this is a much better
 description

---
 BackendProvider/WemosStripUDPServer.py           |  3 ---
 ...nHandler.py => effectControllerJsonHelper.py} |  0
 ...andler.py => rgbStripControllerJsonHelper.py} | 13 ++++++-------
 webserver/HTTPWebSocketsHandler.py               | 16 ++++++++--------
 4 files changed, 14 insertions(+), 18 deletions(-)
 rename rgbUtils/{effectControllerJsonHandler.py => effectControllerJsonHelper.py} (100%)
 rename rgbUtils/{rgbStripControllerJsonHandler.py => rgbStripControllerJsonHelper.py} (53%)

diff --git a/BackendProvider/WemosStripUDPServer.py b/BackendProvider/WemosStripUDPServer.py
index 6986240..bdef459 100644
--- a/BackendProvider/WemosStripUDPServer.py
+++ b/BackendProvider/WemosStripUDPServer.py
@@ -6,9 +6,6 @@ from time import sleep, time
 import json
 import struct
 
-from rgbUtils import effectControllerJsonHandler
-from rgbUtils import rgbStripControllerJsonHandler
-
 class ThreadedUDPServer(threading.Thread):
     def __init__(self,effectController,rgbStripController):
         threading.Thread.__init__(self)
diff --git a/rgbUtils/effectControllerJsonHandler.py b/rgbUtils/effectControllerJsonHelper.py
similarity index 100%
rename from rgbUtils/effectControllerJsonHandler.py
rename to rgbUtils/effectControllerJsonHelper.py
diff --git a/rgbUtils/rgbStripControllerJsonHandler.py b/rgbUtils/rgbStripControllerJsonHelper.py
similarity index 53%
rename from rgbUtils/rgbStripControllerJsonHandler.py
rename to rgbUtils/rgbStripControllerJsonHelper.py
index e7c376e..7855b79 100644
--- a/rgbUtils/rgbStripControllerJsonHandler.py
+++ b/rgbUtils/rgbStripControllerJsonHelper.py
@@ -1,11 +1,10 @@
+"""
+Convert the rgbStripController function outputs to json format
+"""
+
+# get the color values of a single led in json format
 def getRGBData(rgbStrip,led = 0):
-    result = {}
-    data = rgbStrip.getData()
-    red = data[0]
-    green = data[1]
-    blue = data[2]
-    result[led] = {'led': led, 'red': red[led], 'green': green[led], 'blue': blue[led]}
-    return result
+    return {'led': led, 'red': rgbStrip.getData()[0][led], 'green': rgbStrip.getData()[1][led], 'blue': rgbStrip.getData()[2][led]}
 
 # return json of all configured rgbStrips
 def getRGBStrips(rgbStripController):
diff --git a/webserver/HTTPWebSocketsHandler.py b/webserver/HTTPWebSocketsHandler.py
index ea28516..c259a7f 100644
--- a/webserver/HTTPWebSocketsHandler.py
+++ b/webserver/HTTPWebSocketsHandler.py
@@ -1,7 +1,7 @@
 import json
 
-from rgbUtils import effectControllerJsonHandler
-from rgbUtils import rgbStripControllerJsonHandler
+from rgbUtils import effectControllerJsonHelper
+from rgbUtils import rgbStripControllerJsonHelper
 from webserver.SimpleWebSocketServer import WebSocket
 
 import traceback
@@ -52,9 +52,9 @@ class HTTPWebSocketsHandler(WebSocket):
                 elif int(data['register_client_type']) is CLIENT_TYPE_RECORDER:
                     self.client_type = CLIENT_TYPE_RECORDER
 
-            # controller responses are handled by the effectControllerJsonHandler
+            # controller responses are handled by the effectControllerJsonHelper
             if self.client_type is CLIENT_TYPE_CONTROLLER:
-                response = effectControllerJsonHandler.responseHandler(self.effectController, self.rgbStripController, data)
+                response = effectControllerJsonHelper.responseHandler(self.effectController, self.rgbStripController, data)
                 self.sendMessage(
                     json.dumps({
                         'response': response
@@ -95,9 +95,9 @@ class HTTPWebSocketsHandler(WebSocket):
         if self.client_type is CLIENT_TYPE_CONTROLLER:
             self.sendMessage(
                 json.dumps({
-                    'effects': effectControllerJsonHandler.getEffects(self.effectController),
-                    'rgbStrips': rgbStripControllerJsonHandler.getRGBStrips(self.rgbStripController),
-                    'effectThreads': effectControllerJsonHandler.getEffectThreads(self.effectController)
+                    'effects': effectControllerJsonHelper.getEffects(self.effectController),
+                    'rgbStrips': rgbStripControllerJsonHelper.getRGBStrips(self.rgbStripController),
+                    'effectThreads': effectControllerJsonHelper.getEffectThreads(self.effectController)
                 })
             )
             return
@@ -110,6 +110,6 @@ class HTTPWebSocketsHandler(WebSocket):
     def onRGBStripValueUpdate(self,rgbStrip):
         self.sendMessage(
             json.dumps({
-                'data': rgbStripControllerJsonHandler.getRGBData(rgbStrip)
+                'data': rgbStripControllerJsonHelper.getRGBData(rgbStrip)
             })
         )