sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

more broad error catching jsondecode

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-18 11:14:50 +02:00
parent da3426cd30
commit ecaf0194fe
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/tasks.py
View File

@@ -2921,6 +2921,9 @@ def handle_rp3_async_workout(userid,rp3token,rp3id,startdatetime,max_attempts,de
def handle_nk_async_workout(alldata,userid,nktoken,nkid,delaysec,defaulttimezone,debug=False,**kwargs): def handle_nk_async_workout(alldata,userid,nktoken,nkid,delaysec,defaulttimezone,debug=False,**kwargs):
time.sleep(delaysec) time.sleep(delaysec)
s = 'Importing from NK Logbook ID {nkid}'.format(nkid=nkid)
dologging('nklog.log',s)
try: try:
data = alldata[nkid] data = alldata[nkid]
except KeyError: # pragma: no cover except KeyError: # pragma: no cover
@@ -2951,6 +2954,9 @@ def handle_nk_async_workout(alldata,userid,nktoken,nkid,delaysec,defaulttimezone
jsonData = response.json() jsonData = response.json()
strokeData = jsonData[str(nkid)] strokeData = jsonData[str(nkid)]
dologging('nklog.log',json.dumps(data))
dologging('nklog.log',json.dumps(strokeData))
df = strokeDataToDf(strokeData) df = strokeDataToDf(strokeData)
# get workout data # get workout data

2
rowers/utils.py
View File

@@ -547,7 +547,7 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
return np.array(data['data']) return np.array(data['data'])
except TypeError: # pragma: no cover except TypeError: # pragma: no cover
return None return None
except JSONDecodeError: except:
return None return None
return None # pragma: no cover return None # pragma: no cover