diff --git a/.gitignore b/.gitignore index f808e834..c2fcce79 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /django_cache/ *.crt *.key +*.log garminlog.log strava_webhooks.log diff --git a/apilog.log b/apilog.log index e19acd55..261622bc 100644 --- a/apilog.log +++ b/apilog.log @@ -76,3 +76,19 @@ No data in request {"distance": 100, "power": 707, "hr": 153, "pace": 79100, "time": 29000, "spm": 49, "latitude": 52.2261312, "longitude": 6.8499267} 1595667900.0: sander(strokedatajson_v2 POST - data parsed) 2020-12-31 06:10:48.555945+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:14:28.182452+00:00: sander (strokedatajson_v2 POST) +{"distance": 5, "power": 112, "hr": 132, "pace": 145800, "time": 0, "spm": 11, "latitude": 52.2264097, "longitude": 6.8493638} +{"distance": 12, "power": 221, "hr": 131, "pace": 116400, "time": 2200, "spm": 41, "latitude": 52.2263474, "longitude": 6.8495814} +{"distance": 19, "power": 511, "hr": 131, "pace": 88100, "time": 4599, "spm": 56, "latitude": 52.2262715, "longitude": 6.8496975} +{"distance": 27, "power": 673, "hr": 132, "pace": 80400, "time": 7000, "spm": 59, "latitude": 52.2262003, "longitude": 6.8498095} +{"distance": 35, "power": 744, "hr": 133, "pace": 77700, "time": 9599, "spm": 55, "latitude": 52.2261312, "longitude": 6.8499267} +{"distance": 43, "power": 754, "hr": 136, "pace": 77400, "time": 12000, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 51, "power": 754, "hr": 139, "pace": 77400, "time": 14400, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 59, "power": 749, "hr": 142, "pace": 77600, "time": 16799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 67, "power": 729, "hr": 145, "pace": 78300, "time": 19400, "spm": 48, "latitude": 52.2257749, "longitude": 6.8503918} +{"distance": 75, "power": 729, "hr": 147, "pace": 78300, "time": 21799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 82, "power": 726, "hr": 150, "pace": 78400, "time": 24200, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 90, "power": 709, "hr": 152, "pace": 79000, "time": 26599, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 100, "power": 707, "hr": 153, "pace": 79100, "time": 29000, "spm": 49, "latitude": 52.2261312, "longitude": 6.8499267} +2020-07-25 09:05:00+00:00: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:14:29.859936+00:00: sander (strokedatajson_v2 POST completed successfully) diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index 333a281c..19f60590 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -8,6 +8,7 @@ from rowers.tasks import handle_calctrimp from rowers.mailprocessing import send_confirm import sys +import arrow # Stroke data form to test API upload @login_required() @@ -262,7 +263,7 @@ def strokedatajson_v2(request,id): unixtime = starttime+time with open('apilog.log','a') as logfile: - logfile.write(str(starttime)+": ") + logfile.write(str(arrow.get(starttime).datetime)+": ") logfile.write(request.user.username+"(strokedatajson_v2 POST - data parsed) \r\n") diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 215edc07..5056926d 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1717,7 +1717,7 @@ def workout_getimportview(request,externalid,source = 'c2'): try: notes = data['comments'] name = notes[:40] - except KeyError: + except (KeyError,TypeError): comments = 'C2 Import Workout from {startdatetime}'.format(startdatetime=startdatetime) name = notes