From 07a3ba6c1cddb10af64f4b7223de17e43d1418ed Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 3 Apr 2017 20:02:49 +0200 Subject: [PATCH] error catching around non painsled parsers --- rowers/dataprep.py | 10 +++++++++- rowers/views.py | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 662499f9..d8424f62 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -610,7 +610,15 @@ def new_workout_from_file(r,f2, # handle non-Painsled by converting it to painsled compatible CSV if (fileformat != 'csv'): - f2,summary,oarlength,inboard = handle_nonpainsled(f2,fileformat,summary=summary) + try: + f2,summary,oarlength,inboard = handle_nonpainsled(f2, + fileformat, + summary=summary) + except: + errorstring = str(sys.exc_info()[0]) + message = 'Something went wrong: '+errorstring + return (0,message,'') + dosummary = (fileformat != 'fit') diff --git a/rowers/views.py b/rowers/views.py index cb8d3fc7..89652250 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5132,10 +5132,10 @@ def workout_upload_view(request,message="", id,message,f2 = dataprep.new_workout_from_file(r,f2, - workouttype=workouttype, - makeprivate=makeprivate, - title = t, - notes='') + workouttype=workouttype, + makeprivate=makeprivate, + title = t, + notes='') if not id: url = reverse(workout_upload_view, args=[str(message)])