[supervise] shift dictionary values to index (#30)

pyheatpump/cli.py

@@ -166,6 +166,31 @@ def supervise(since):
 
     from .models.heatpump import Heatpump
 
+    def shift_response(d):
+        def shift_dict(d):
+            d_k = list(map(int, d.keys()))
+            if not len(d_k):
+                return d
+
+            d_k.sort()
+            offset = d_k[0]-1
+            return {
+                str(k - offset): d[str(k)]
+                for k in d_k
+                if str(k) in d
+            }
+
+        if 'Analog' in d.keys():
+            d.update({"Analog": shift_dict(d['Analog'])})
+
+        if 'Integer' in d.keys():
+            d.update({"Integer": shift_dict(d['Integer'])})
+
+        if 'Digital' in d.keys():
+            d.update({"Digital": shift_dict(d['Digital'])})
+
+        return d
+
 
     if not since:
         last_update = 0
@@ -207,17 +232,17 @@ def supervise(since):
 
     for packet in post_packets:
         try:
-            logger.debug(json.dumps(packet))
+            logger.debug(json.dumps(shift_response(packet)))
         except Exception as e:
             print(e)
             sys.exit(1)
 
 
     for packet in post_packets:
-        logger.debug('Will send %s', packet)
+        logger.debug('Will send %s', shift_response(packet))
         post_resp = requests.post(
             url=build_url(post_url),
-            json=packet,
+            json=shift_response(packet),
             verify=False
         )
         if post_resp.status_code == 200: