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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-07 22:44:16 +01:00
parent 2aa9702cf9
commit f11a4f0579
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/dataprep.py
View File

@@ -1472,6 +1472,7 @@ def new_workout_from_file(r, f2,
makeprivate=False, makeprivate=False,
notes=''): notes=''):
message = None message = None
impeller = False
try: try:
fileformat = get_file_type(f2) fileformat = get_file_type(f2)
except (IOError,UnicodeDecodeError): except (IOError,UnicodeDecodeError):

15
rowers/mailprocessing.py
View File

@@ -49,7 +49,7 @@ def send_confirm(user, name, link, options):
fullemail = user.email fullemail = user.email
subject = 'New Workout Added: '+name subject = 'New Workout Added: '+name
res = send_template_email('Rowsandall <info@rowsandall.com>', res = send_template_email('Rowsandall <info@rowsandall.com>',
[fullemail], [fullemail],
subject,'confirmemail.html', subject,'confirmemail.html',
@@ -86,6 +86,7 @@ def rdata(file, rower=rrower()):
def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False): def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
""" This one is used in processemail """ """ This one is used in processemail """
workouttype = 'rower' workouttype = 'rower'
impeller = False
try: try:
datafilename = datafile.name datafilename = datafile.name
@@ -108,7 +109,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
if testing: if testing:
print('Fileformat = ',fileformat) print('Fileformat = ',fileformat)
f,e = os.path.splitext(datafilename) f,e = os.path.splitext(datafilename)
if fileformat == 'unknown' and 'txt' not in e: if fileformat == 'unknown' and 'txt' not in e:
fcopy = "media/"+datafilename fcopy = "media/"+datafilename
@@ -134,12 +135,12 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
summary = '' summary = ''
# handle non-Painsled # handle non-Painsled
if fileformat == 'att': if fileformat == 'att':
return 0 return 0
if fileformat != 'csv': if fileformat != 'csv':
filename_mediadir, summary, oarlength, inboard,fileformat = dataprep.handle_nonpainsled( filename_mediadir, summary, oarlength, inboard,fileformat,impeller = dataprep.handle_nonpainsled(
'media/' + datafilename, fileformat, summary) 'media/' + datafilename, fileformat, summary)
if not filename_mediadir: if not filename_mediadir:
return 0 return 0
@@ -148,7 +149,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
inboard = 0.88 inboard = 0.88
oarlength = 2.89 oarlength = 2.89
row = rdata(filename_mediadir) row = rdata(filename_mediadir)
if row == 0: if row == 0:
return 0 return 0
@@ -168,7 +169,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
row.write_csv(datafilename, gzip=True) row.write_csv(datafilename, gzip=True)
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat) dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
dosummary = dosummary or summary == '' dosummary = dosummary or summary == ''
if name == '': if name == '':
name = 'Workout from Background Queue' name = 'Workout from Background Queue'
@@ -181,7 +182,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
oarlength=oarlength, oarlength=oarlength,
title=name, title=name,
workoutsource=fileformat, workoutsource=fileformat,
notes='' notes='',impeller=impeller,
) )