dexcom_dumper: improve JSON serialization format

normal & special EGV_DATA values are now distinguished with a tag

1 files changed, 49 insertions, 15 deletions

diff --git a/dexcom_reader/dexcom_dumper.py b/dexcom_reader/dexcom_dumper.py
index 8a0c0d6..2694b83 100644
--- a/dexcom_reader/dexcom_dumper.py
+++ b/dexcom_reader/dexcom_dumper.py
@@ -129,17 +129,18 @@ def sleep_verbose(n):
         sleep(n)
 
 def POST(path, json_str):
-        resp = None
+        msg = None
         try:
                 import requests
                 resp = requests.post(HOST + path, data=json_str,
                                      headers={'Content-type': 'application/json'})
+                msg = resp.text
                 resp.raise_for_status()
                 return True
-        except:
-                print_verbose(sys.exc_info())
-                if resp:
-                        print_verbose(resp.text)
+        except requests.exceptions.HTTPError as e:
+                print_verbose(e)
+                if msg:
+                        print_verbose(msg)
                 return False
 
 def send_ping(now):
@@ -149,7 +150,8 @@ def send_ping(now):
 def print_cgm_bg(now, r):
         if HOST:
                 r.trend_arrow.replace('45_', 'DIAGONAL_', 1)
-                POST('/bgevent', toJSON(r))
+                if not r.is_special:
+                        POST('/egv_data', toJSON(r))
                 send_ping(now)
                 return
         elif JSON:
@@ -181,10 +183,35 @@ def poll():
 def since(when, rectype='EGV_DATA'):
         return reversed(list(takewhile(lambda r: r.system_time > when, dr.iter_records(rectype))))
 
+def parsetime(s):
+        return datetime.strptime(s, "%Y-%m-%dT%H:%M:%SZ")
+
 def test():
         now = dr.ReadSystemTime()
         POST('/ping', toJSON(now))
 
+        import requests
+        rectype = 'EGV_DATA'
+        resp = requests.get(HOST + '/egv_data/1')
+        resp.raise_for_status()
+        rs = None
+        if len(resp.json()):
+                when = parsetime(resp.json()[0]['contents']['system_time'])
+                print when
+                rs = list(since(when, rectype))
+        else:
+                #rs = list(reversed(list(dr.iter_records(rectype))))
+                now = dr.ReadSystemTime()
+                when = now - timedelta(days=5)
+                rs = list(since(when, rectype))
+
+        print len(rs)
+        print POST('/egv_datas', toJSON(rs))
+
+def test0():
+        now = dr.ReadSystemTime()
+        POST('/ping', toJSON(now))
+
         for t in parseable_record_types():
                 rs = dr.ReadRecords(t, 1)
                 if not rs:
@@ -193,30 +220,37 @@ def test():
                 print toJSON([t,r])
 
 class JSON_Time(json.JSONEncoder):
-    def default(self, o):
-            if isinstance(o, datetime):
+        def default(self, o):
+                if isinstance(o, datetime):
                         if o.tzinfo is None:
                                 from pytz import UTC
                                 return o.replace(tzinfo=UTC).isoformat()
                         else:
                                 return o.isoformat()
 
-            return json.JSONEncoder.default(self, o)
+                return json.JSONEncoder.default(self, o)
 
 class JSON_CGM(JSON_Time):
-    def default(self, o):
-            if isinstance(o, EGVRecord) and o.is_special:
+        def default(self, o):
+
+                if isinstance(o, EGVRecord) and o.is_special:
                         op={}
                         for k in o.BASE_FIELDS + ['glucose_special_meaning']:
                                 op[k] = getattr(o, k)
-                        return op
-            elif isinstance(o, GenericTimestampedRecord):
+                        return {'tag': 'BGE_Special', 'contents': op}
+
+                elif isinstance(o, GenericTimestampedRecord):
                         op={}
                         for k in o.BASE_FIELDS + o.FIELDS:
                                 op[k] = getattr(o, k)
-                        return op
 
-            return JSON_Time.default(self, o)
+                        if isinstance(o, EGVRecord):
+                                return {'tag': 'BGE_Normal', 'contents': op}
+                        else:
+                                return op
+
+                else:
+                        return JSON_Time.default(self, o)
 
 def toJSON(o):
         return json.dumps(o, cls=JSON_CGM)