bug fixes

rowers/dataprep.py

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

rowers/mailprocessing.py

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