dexcom_dumper: change JSON format again

1 files changed, 13 insertions, 7 deletions

diff --git a/dexcom_reader/dexcom_dumper.py b/dexcom_reader/dexcom_dumper.py
index c9624d2..d56dd15 100644
--- a/dexcom_reader/dexcom_dumper.py
+++ b/dexcom_reader/dexcom_dumper.py
@@ -248,7 +248,7 @@ def remote_update(rectype):
         resp.raise_for_status()
         when = None
         if len(resp.json()):
-                when = parsetime(resp.json()[0][1]['system_time'])
+                when = parsetime(resp.json()[0]['system_time'])
                 #print_verbose("Latest record on server: %s" % when.isoformat())
 
         (rs, r) = since_and_first(when, rectype)
@@ -283,19 +283,25 @@ class JSON_CGM(JSON_Time):
 
                 if isinstance(o, EGVRecord) and o.is_special:
                         op={}
-                        for k in o.BASE_FIELDS + ['glucose_special_meaning']:
+                        record={}
+                        for k in o.BASE_FIELDS:
                                 op[k] = getattr(o, k)
-                        return ['BGE_Special', op]
+                        op['record'] = [getattr(o, 'glucose_special_meaning'), []]
+                        return op
 
                 elif isinstance(o, GenericTimestampedRecord):
                         op={}
-                        for k in o.BASE_FIELDS + o.FIELDS:
+                        record={}
+                        for k in o.BASE_FIELDS:
                                 op[k] = getattr(o, k)
+                        for k in o.FIELDS:
+                                record[k] = getattr(o, k)
 
                         if isinstance(o, EGVRecord):
-                                return ['BGE_Normal', op]
-                        else:
-                                return op
+                                record = ['EGVRecord', record]
+
+                        op['record'] = record
+                        return op
 
                 else:
                         return JSON_Time.default(self, o)