Merge branch 'hotfix/stravasherlock'

rowers/dataprep.py

@@ -518,7 +518,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
     try:
         drivespeed = drivelength/rowdatadf[' DriveTime (ms)']*1.0e3
     except TypeError:
-        drivespeed = 0.0*rowdatadf['TimeStam (sec)']
+        drivespeed = 0.0*rowdatadf['TimeStamp (sec)']
         
     drivespeed = drivespeed.fillna(value=0)
     driveenergy = drivelength*averageforce*4.44822

rowers/stravastuff.py

@@ -247,13 +247,20 @@ def createstravaworkoutdata(w):
 def handle_stravaexport(file,workoutname,stravatoken,description=''):
     # w = Workout.objects.get(id=workoutid)
     client = stravalib.Client(access_token=stravatoken)
-
+    try:
-    act = client.upload_activity(file,'tcx',name=workoutname)
+        act = client.upload_activity(file,'tcx',name=workoutname)
-    res = act.wait(poll_interval=5.0)
+        res = act.wait(poll_interval=5.0)
 
 
-    # description doesn't work yet. Have to wait for stravalib to update
+        # description doesn't work yet. Have to wait for stravalib to update
-    act = client.update_activity(res.id,activity_type='Rowing',description=description)
+        act = client.update_activity(res.id,activity_type='Rowing',description=description)
+    except:
+        with open("media/stravaerrors.log","a") as errorlog:
+            errorstring = str(sys.exc_info()[0])
+            timestr = time.strftime("%Y%m%d-%H%M%S")
+            errorlog.write(timestr+errorstring+"\r\n")
+            errorlog.write("stravastuff.py line 262\r\n")
+
 
 
     # w.uploadedtostrava = res.id

rowers/views.py

@@ -934,9 +934,17 @@ def workout_strava_upload_view(request,id=0):
 
 	    try:
 		with open(tcxfile,'rb') as f:
-		    res = stravastuff.handle_stravaexport(f,w.name,
+                    try:
-							  r.stravatoken,
+		        res = stravastuff.handle_stravaexport(f,w.name,
-							  description=w.notes)
+							      r.stravatoken,
+							      description=w.notes)
+                    except:
+                        with open("media/stravaerrors.log","a") as errorlog:
+                            errorstring = str(sys.exc_info()[0])
+                            timestr = time.strftime("%Y%m%d-%H%M%S")
+                            errorlog.write(timestr+errorstring+"\r\n")
+                            errorlog.write("views.py line 946\r\n")
+
 
 		w.uploadedtostrava = res
 		w.save()