summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2017-01-28 09:37:15 +0000
committerAndrew Cady <d@jerkface.net>2017-01-28 09:37:15 +0000
commit484d70b4c32871778f4dd943659332750b4a78f6 (patch)
tree8c5ad358776a026ed00d04f5e84e8418c0b5fff2
parent184f483e845f586bd53ae88310512af1538f5400 (diff)
dexcom_dumper: change JSON representation of sum type
-rw-r--r--dexcom_reader/dexcom_dumper.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/dexcom_reader/dexcom_dumper.py b/dexcom_reader/dexcom_dumper.py
index e7643ec..d479e5e 100644
--- a/dexcom_reader/dexcom_dumper.py
+++ b/dexcom_reader/dexcom_dumper.py
@@ -2,6 +2,7 @@ import constants
2import readdata 2import readdata
3import sys 3import sys
4import json 4import json
5import traceback
5# import requests # As this takes SEVEN SECONDS, it's delayed until needed 6# import requests # As this takes SEVEN SECONDS, it's delayed until needed
6from sys import stdout, stderr 7from sys import stdout, stderr
7from datetime import timedelta, datetime 8from datetime import timedelta, datetime
@@ -178,7 +179,7 @@ def poll():
178 print_verbose('Exiting.') 179 print_verbose('Exiting.')
179 return 180 return
180 except: 181 except:
181 print_verbose('Caught error: %s' % sys.exc_info()) 182 traceback.print_exc()
182 sleep_verbose(10) 183 sleep_verbose(10)
183 184
184def poll_remote(): 185def poll_remote():
@@ -243,7 +244,7 @@ def remote_update(rectype):
243 resp.raise_for_status() 244 resp.raise_for_status()
244 when = None 245 when = None
245 if len(resp.json()): 246 if len(resp.json()):
246 when = parsetime(resp.json()[0]['contents']['system_time']) 247 when = parsetime(resp.json()[0][1]['system_time'])
247 #print_verbose("Latest record on server: %s" % when.isoformat()) 248 #print_verbose("Latest record on server: %s" % when.isoformat())
248 249
249 (rs, r) = since_and_first(when, rectype) 250 (rs, r) = since_and_first(when, rectype)
@@ -280,7 +281,7 @@ class JSON_CGM(JSON_Time):
280 op={} 281 op={}
281 for k in o.BASE_FIELDS + ['glucose_special_meaning']: 282 for k in o.BASE_FIELDS + ['glucose_special_meaning']:
282 op[k] = getattr(o, k) 283 op[k] = getattr(o, k)
283 return {'tag': 'BGE_Special', 'contents': op} 284 return ['BGE_Special', op]
284 285
285 elif isinstance(o, GenericTimestampedRecord): 286 elif isinstance(o, GenericTimestampedRecord):
286 op={} 287 op={}
@@ -288,7 +289,7 @@ class JSON_CGM(JSON_Time):
288 op[k] = getattr(o, k) 289 op[k] = getattr(o, k)
289 290
290 if isinstance(o, EGVRecord): 291 if isinstance(o, EGVRecord):
291 return {'tag': 'BGE_Normal', 'contents': op} 292 return ['BGE_Normal', op]
292 else: 293 else:
293 return op 294 return op
294 295