diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 4a931a70..4c7c4263 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -3,6 +3,13 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals +import logging +logging.basicConfig( + filename='debuglog.log', + level=logging.DEBUG, + format='%(asctime)s %(message)s', + datefmt='%m/%d/%Y %I:%M:%S %p' +) # The interactions with the Concept2 logbook API # All C2 related functions should be defined here @@ -849,11 +856,26 @@ def get_workout(user,c2id,do_async=False): return custom_exception_handler(401,s), 0 data = s.json()['data'] + alldata = {c2id:data} splitdata = None #with open('c2temp.json','w') as f: # f.write(json.dumps(s.json())) # print(s.json()) + if do_async: + print('aap',alldata) + job = myqueue(queuehigh, + handle_c2_async_workout, + alldata, + r.user.id, + r.c2token, + c2id, + 0, + r.defaulttimezone) + + return data, pd.DataFrame() + + if 'workout' in data: if 'splits' in data['workout']: # pragma: no cover splitdata = data['workout']['splits'] @@ -873,6 +895,7 @@ def get_workout(user,c2id,do_async=False): else: # pragma: no cover strokedata = pd.DataFrame() + return data,strokedata # Get stroke data belonging to C2 ID diff --git a/rowers/tasks.py b/rowers/tasks.py index 5ce2807d..bbb9c8bf 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -36,6 +36,14 @@ from iso8601 import ParseError from json.decoder import JSONDecodeError +import logging +logging.basicConfig( + filename='debuglog.log', + level=logging.CRITICAL, + format='%(asctime)s %(message)s', + datefmt='%m/%d/%Y %I:%M:%S %p' +) + from matplotlib.backends.backend_agg import FigureCanvas #from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas import matplotlib.pyplot as plt @@ -2997,6 +3005,10 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone startdatetime = iso8601.parse_date(data['date']) weightclass = data['weight_class'] + s = 'User {userid}, C2 ID {c2id}'.format(userid=userid,c2id=c2id) + logging.critical(s) + logging.critical(data) + try: title = data['name'] except KeyError: @@ -3022,6 +3034,12 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone timezone = pytz.timezone(data['timezone']) startdatetime = startdatetime.astimezone(timezone) + s = 'Time zone {timezone}, stardatetime {startdatetime}, duration {duration}'.format( + timezone=timezone,startdatetime=startdatetime, + duration=duration) + logging.critical(s) + + workoutdate = startdatetime.astimezone( timezone diff --git a/rowers/templates/c2_list_import.html b/rowers/templates/c2_list_import.html index e8015401..6e96fd08 100644 --- a/rowers/templates/c2_list_import.html +++ b/rowers/templates/c2_list_import.html @@ -34,11 +34,11 @@