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

error catching around non painsled parsers

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-03 20:02:49 +02:00
parent 6da296365d
commit 07a3ba6c1c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/dataprep.py
View File

@@ -610,7 +610,15 @@ def new_workout_from_file(r,f2,
# handle non-Painsled by converting it to painsled compatible CSV # handle non-Painsled by converting it to painsled compatible CSV
if (fileformat != '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') dosummary = (fileformat != 'fit')

8
rowers/views.py
View File

@@ -5132,10 +5132,10 @@ def workout_upload_view(request,message="",
f2 = res[1] # file name incl media directory f2 = res[1] # file name incl media directory
id,message,f2 = dataprep.new_workout_from_file(r,f2, id,message,f2 = dataprep.new_workout_from_file(r,f2,
workouttype=workouttype, workouttype=workouttype,
makeprivate=makeprivate, makeprivate=makeprivate,
title = t, title = t,
notes='') notes='')
if not id: if not id:
url = reverse(workout_upload_view, url = reverse(workout_upload_view,