mailprocessing using dataprep (not tested)

rowers/dataprep.py

@@ -327,6 +327,80 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 
     return (w.id,message)
 
+def handle_nonpainsled(f2,fileformat,summary=''):
+    # handle RowPro:
+    if (fileformat == 'rp'):
+	row = RowProParser(f2)
+	# handle TCX
+    if (fileformat ==  'tcx'):
+	row = TCXParser(f2)
+                    
+    # handle Mystery
+    if (fileformat == 'mystery'):
+	row = MysteryParser(f2)
+
+    # handle TCX no HR
+    if (fileformat == 'tcxnohr'):
+	row = TCXParserNoHR(f2)
+		    
+    # handle RowPerfect
+    if (fileformat == 'rowperfect3'):
+        row = RowPerfectParser(f2)
+            
+    # handle ErgData
+    if (fileformat == 'ergdata'):
+	row = ErgDataParser(f2)
+
+    # handle Mike
+    if (fileformat == 'bcmike'):
+        row = BoatCoachAdvancedParser(f2)
+            
+    # handle BoatCoach
+    if (fileformat == 'boatcoach'):
+	row = BoatCoachParser(f2)
+
+    # handle painsled desktop
+    if (fileformat == 'painsleddesktop'):
+	row = painsledDesktopParser(f2)
+
+    # handle speed coach GPS
+    if (fileformat == 'speedcoach'):
+	row = speedcoachParser(f2)
+
+    # handle speed coach GPS 2 
+    if (fileformat == 'speedcoach2'):
+	row = SpeedCoach2Parser(f2)
+        try:
+            summary = row.allstats()
+        except:
+            pass
+
+
+    # handle ErgStick
+    if (fileformat == 'ergstick'):
+	row = ErgStickParser(f2)
+		    
+    # handle FIT
+    if (fileformat == 'fit'):
+	row = FITParser(f2)
+	s = fitsummarydata(f2)
+	s.setsummary()
+	summary = s.summarytext
+
+
+    f_to_be_deleted = f2
+    # should delete file
+    f2 = f2[:-4]+'o.csv'
+    row.write_csv(f2,gzip=True)
+    
+    #os.remove(f2)
+    try:
+	os.remove(f_to_be_deleted)
+    except:
+        os.remove(f_to_be_deleted+'.gz')
+
+    return (f2,summary)
+
 # Create new workout from file and store it in the database
 # This routine should be used everywhere in views.py and mailprocessing.py
 # Currently there is code duplication
@@ -375,76 +449,7 @@ def new_workout_from_file(r,f2,
         
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):
-	# handle RowPro:
-	if (fileformat == 'rp'):
-	    row = RowProParser(f2)
-	    # handle TCX
-	if (fileformat ==  'tcx'):
-	    row = TCXParser(f2)
-                    
-	# handle Mystery
-	if (fileformat == 'mystery'):
-	    row = MysteryParser(f2)
-
-	# handle TCX no HR
-	if (fileformat == 'tcxnohr'):
-	    row = TCXParserNoHR(f2)
-		    
-        # handle RowPerfect
-        if (fileformat == 'rowperfect3'):
-            row = RowPerfectParser(f2)
-            
-	# handle ErgData
-	if (fileformat == 'ergdata'):
-	    row = ErgDataParser(f2)
-
-        # handle Mike
-        if (fileformat == 'bcmike'):
-            row = BoatCoachAdvancedParser(f2)
-            
-	# handle BoatCoach
-	if (fileformat == 'boatcoach'):
-	    row = BoatCoachParser(f2)
-
-	# handle painsled desktop
-	if (fileformat == 'painsleddesktop'):
-	    row = painsledDesktopParser(f2)
-
-	# handle speed coach GPS
-	if (fileformat == 'speedcoach'):
-	    row = speedcoachParser(f2)
-
-	# handle speed coach GPS 2 
-	if (fileformat == 'speedcoach2'):
-	    row = SpeedCoach2Parser(f2)
-            try:
-                summary = row.allstats()
-            except:
-                pass
-
-
-	# handle ErgStick
-        if (fileformat == 'ergstick'):
-	    row = ErgStickParser(f2)
-		    
-	# handle FIT
-	if (fileformat == 'fit'):
-	    row = FITParser(f2)
-	    s = fitsummarydata(f2)
-	    s.setsummary()
-	    summary = s.summarytext
-
-
-	f_to_be_deleted = f2
-	# should delete file
-	f2 = f2[:-4]+'o.csv'
-	row.write_csv(f2,gzip=True)
-
-        #os.remove(f2)
-        try:
-	    os.remove(f_to_be_deleted)
-        except:
-            os.remove(f_to_be_deleted+'.gz')
+        f2,summary = handle_nonpainsled(f2,fileformat,summary=summary)
 
 
     dosummary = (fileformat != 'fit')