Merge branch 'develop' into feature/restapi

rowers/views.py

@@ -135,7 +135,10 @@ def rdata(file,rower=rrower()):
     try:
 	res = rrdata(file,rower=rower)
     except IOError:
-	res = 0
+        try:
+            res = rrdata(file+'.gz',rower=rower)
+        except IOError:
+            res = 0
 
     return res
 
@@ -445,7 +448,8 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 
     csvfilename ='media/Import_'+str(importid)+'.csv'
 
-    res =  df.to_csv(csvfilename,index_label='index')
+    res =  df.to_csv(csvfilename+'.gz',index_label='index',
+                     compression='gzip')
 
     averagehr = df[' HRCur (bpm)'].mean()
     maxhr = df[' HRCur (bpm)'].max()
@@ -677,7 +681,8 @@ def add_workout_from_stdata(user,importid,data):
 
     csvfilename ='media/Import_'+str(importid)+'.csv'
 
-    res =  df.to_csv(csvfilename,index_label='index')
+    res =  df.to_csv(csvfilename+'.gz',index_label='index',
+                     compression='gzip')
 
     averagehr = df[' HRCur (bpm)'].mean()
     maxhr = df[' HRCur (bpm)'].max()
@@ -2048,7 +2053,7 @@ def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
 	velo = row.df['originalvelo'].values
 	row.df[' Stroke500mPace (sec/500m)'] = 500./velo
 
-    row.write_csv(filename)
+    row.write_csv(filename,gzip=True)
     dataprep.update_strokedata(id,row.df)
 
     url = "/rowers/workout/"+str(id)+"/advanced"
@@ -2085,7 +2090,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
 
     row.df = row.df.fillna(0)
 
-    row.write_csv(filename)
+    row.write_csv(filename,gzip=True)
     dataprep.update_strokedata(id,row.df)
 
     url = "/rowers/workout/"+str(id)+"/advanced"
@@ -2155,7 +2160,7 @@ def workout_downloadwind_view(request,id=0,message="",successmessage=""):
 	bearing = rowdata.df.ix[:,'bearing'].values
     except KeyError:
 	rowdata.add_bearing()
-	rowdata.write_csv(f1)
+	rowdata.write_csv(f1,gzip=True)
 
     # get wind
     try:
@@ -2174,7 +2179,7 @@ def workout_downloadwind_view(request,id=0,message="",successmessage=""):
 	row.notes += "\n"+message
 	row.save()
 	rowdata.add_wind(windspeed,windbearing)
-	rowdata.write_csv(f1)
+	rowdata.write_csv(f1,gzip=True)
 	
 	kwargs = {'successmessage':str(message),
 		  'id':str(id)}
@@ -2224,7 +2229,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
 	bearing = rowdata.df.ix[:,'bearing'].values
     except KeyError:
 	rowdata.add_bearing()
-	rowdata.write_csv(f1)
+	rowdata.write_csv(f1,gzip=True)
 	
 
     
@@ -2249,7 +2254,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
 				dist1,dist2,
 				units=windunit)
 
-	    rowdata.write_csv(f1)
+	    rowdata.write_csv(f1,gzip=True)
 
 	    
 	else:
@@ -2323,7 +2328,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
 	    rowdata.update_stream(stream1,stream2,dist1,dist2,
 				units=streamunit)
 
-	    rowdata.write_csv(f1)
+	    rowdata.write_csv(f1,gzip=True)
 
 	    
 	else:
@@ -2381,19 +2386,19 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
 		vstream = rowdata.df['vstream']
 	    except KeyError:
 		rowdata.add_stream(0)
-		rowdata.write_csv(f1)
+		rowdata.write_csv(f1,gzip=True)
 
 	    try:
 		bearing = rowdata.df['bearing']
 	    except KeyError:
 		rowdata.add_bearing()
-		rowdata.write_csv(f1)
+		rowdata.write_csv(f1,gzip=True)
 
 	    try:
 		vwind = rowdata.df['vwind']
 	    except KeyError:
 		rowdata.add_wind(0,0)
-		rowdata.write_csv(f1)
+		rowdata.write_csv(f1,gzip=True)
 
 	    # do power calculation (asynchronous)
 	    u = request.user
@@ -2959,7 +2964,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 		    if r == 0:
 			return HttpResponse("Error: CSV Data File Not Found")
 		    r.rowdatetime = startdatetime
-		    r.write_csv(row.csvfilename)
+		    r.write_csv(row.csvfilename,gzip=True)
                     dataprep.update_strokedata(id,r.df)
 		    successmessage = "Changes saved"
 		    url = "/rowers/workout/"+str(row.id)+"/edit"
@@ -3706,8 +3711,13 @@ def workout_upload_view(request,message=""):
 		    f_to_be_deleted = f2
 		    # should delete file
 		    f2 = f2[:-4]+'o.csv'
-		    row.write_csv(f2)
-		    os.remove(f_to_be_deleted)
+		    row.write_csv(f2,gzip=True)
+
+                    #os.remove(f2)
+                    try:
+		        os.remove(f_to_be_deleted)
+                    except:
+                        os.remove(f_to_be_deleted+'.gz')
 
 		# make workout and put in database
 		r = Rower.objects.get(user=request.user)
@@ -3721,7 +3731,7 @@ def workout_upload_view(request,message=""):
 		# auto smoothing
 		pace = row.df[' Stroke500mPace (sec/500m)'].values
 		velo = 500./pace
-
+                
 		f = row.df['TimeStamp (sec)'].diff().mean()
 		windowsize = 2*(int(10./(f)))+1
 
@@ -3743,14 +3753,19 @@ def workout_upload_view(request,message=""):
 
 		row.df = row.df.fillna(0)
 
-		row.write_csv(f2)
+		row.write_csv(f2,gzip=True)
+                try:
+                    os.remove(f2)
+                except:
+                    pass
 
+                
 		# recalculate power data
 		if workouttype == 'rower' or workouttype == 'dynamic' or workouttype == 'slides':
 		    try:
 			row.erg_recalculatepower()
 #			row.spm_fromtimestamps()
-			row.write_csv(f2)
+			row.write_csv(f2,gzip=True)
 		    except:
 			pass
 
@@ -3987,8 +4002,12 @@ def workout_upload_view_debug(request,message=""):
 		f_to_be_deleted = f2
 		# should delete file
 		f2 = f2[:-4]+'o.csv'
-		row.write_csv(f2)
-		os.remove(f_to_be_deleted)
+		row.write_csv(f2,gzip=True)
+                try:
+		    os.remove(f_to_be_deleted)
+                except:
+                    os.remove(f_to_be_deleted+'.gz')
+                    # remove uncompressed
 
 	    # make workout and put in database
 	    r = Rower.objects.get(user=request.user)
@@ -3996,8 +4015,10 @@ def workout_upload_view_debug(request,message=""):
 			hrut1=r.ut1,hrat=r.at,
 			hrtr=r.tr,hran=r.an,ftp=r.ftp)
 	    row = rdata(f2,rower=rr)
+            
 	    if row == 0:
 		return HttpResponse("Error: CSV Data File Not Found")
+            row.write_csv(f2,gzip=True)
 	    averagehr = row.df[' HRCur (bpm)'].mean()
 	    maxhr = row.df[' HRCur (bpm)'].max()
 	    totaldist = row.df['cum_dist'].max()
@@ -4302,7 +4323,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
     if rowdata == 0:
 	return HttpResponse("Error: CSV Data File Not Found")
     rowdata.restoreintervaldata()
-    rowdata.write_csv(f1)
+    rowdata.write_csv(f1,gzip=True)
     dataprep.update_strokedata(id,rowdata.df)
     intervalstats = rowdata.allstats()
     row.summary = intervalstats
@@ -4387,7 +4408,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	#intervalstats = rowdata.allstats()
 	row.notes += "\n"+s
 	row.save()
-	rowdata.write_csv(f1)
+	rowdata.write_csv(f1,gzip=True)
         dataprep.update_strokedata(id,rowdata.df)
 	data = {'intervalstring':s}
 	form = SummaryStringForm(initial=data)
@@ -4439,7 +4460,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	row.summary = intervalstats
 	row.notes += "\n"+s
 	row.save()
-	rowdata.write_csv(f1)
+	rowdata.write_csv(f1,gzip=True)
         dataprep.update_strokedata(id,rowdata.df)
 	    
 
@@ -4791,7 +4812,8 @@ def strokedatajson(request,id):
         timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S")
         csvfilename ='media/Import_'+timestr+'.csv'
         
-        res =  data.to_csv(csvfilename,index_label='index')
+        res =  data.to_csv(csvfilename+'.gz',index_label='index',
+                           compression='gzip')
         row.csvfilename = csvfilename
         row.save()