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

messages for upload

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-11 09:21:07 +02:00
parent 33e185912e
commit 80ebb91255
7 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/c2stuff.py
View File

@@ -541,7 +541,7 @@ def process_callback(request):
# Uploading workout # Uploading workout
def workout_c2_upload(user,w): def workout_c2_upload(user,w):
response = 'trying C2 upload' message = 'trying C2 upload'
thetoken = c2_open(user) thetoken = c2_open(user)
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
@@ -565,7 +565,7 @@ def workout_c2_upload(user,w):
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Concept2 Duplicate error"
w.uploadedtoc2 = -1 w.uploadedtoc2 = -1
c2id = -1 c2id = -1
w.save() w.save()
@@ -581,7 +581,7 @@ def workout_c2_upload(user,w):
c2id = 0 c2id = 0
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout to Concept2"
c2id = 0 c2id = 0
return message,c2id return message,c2id

6
rowers/runkeeperstuff.py
View File

@@ -319,7 +319,7 @@ def get_userid(access_token):
return str(res) return str(res)
def workout_runkeeper_upload(user,w): def workout_runkeeper_upload(user,w):
message = "" message = "Uploading to Runkeeper"
rkid = 0 rkid = 0
r = w.user r = w.user
@@ -332,7 +332,7 @@ def workout_runkeeper_upload(user,w):
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
data = createrunkeeperworkoutdata(w) data = createrunkeeperworkoutdata(w)
if not data: if not data:
message = "Data error" message = "Data error in Runkeeper Upload"
rkid = 0 rkid = 0
return message, rkid return message, rkid
@@ -357,7 +357,7 @@ def workout_runkeeper_upload(user,w):
rkuri = geturifromid(thetoken,rkid) rkuri = geturifromid(thetoken,rkid)
w.uploadedtorunkeeper = rkid w.uploadedtorunkeeper = rkid
w.save() w.save()
return '',rkid return 'Successfully synchronized to Runkeeper',rkid
else: else:
s = response s = response
message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text) message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text)

4
rowers/sporttracksstuff.py
View File

@@ -319,7 +319,7 @@ def getidfromresponse(response):
def workout_sporttracks_upload(user,w): def workout_sporttracks_upload(user,w):
message = "" message = "Uploading to SportTracks"
stid = 0 stid = 0
# ready to upload. Hurray # ready to upload. Hurray
r = w.user r = w.user
@@ -353,7 +353,7 @@ def workout_sporttracks_upload(user,w):
stid = getidfromresponse(response) stid = getidfromresponse(response)
w.uploadedtosporttracks = stid w.uploadedtosporttracks = stid
w.save() w.save()
return '',stid return 'Successfully synced to SportTracks',stid
else: else:
s = response s = response
message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason

6
rowers/stravastuff.py
View File

@@ -275,7 +275,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description=''):
message = 'Workout successfully synchronized to Strava' message = 'Workout successfully synchronized to Strava'
except: except:
res = 0 res = 0
message = 'Strava upload timed out'
# description doesn't work yet. Have to wait for stravalib to update # description doesn't work yet. Have to wait for stravalib to update
@@ -289,7 +289,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description=''):
def workout_strava_upload(user,w): def workout_strava_upload(user,w):
message = "" message = "Uploading to Strava"
stravaid=-1 stravaid=-1
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
res = -1 res = -1
@@ -322,7 +322,7 @@ def workout_strava_upload(user,w):
os.remove(tcxfile) os.remove(tcxfile)
except WindowsError: except WindowsError:
pass pass
message = '' message = mes
stravaid = res stravaid = res
return message,stravaid return message,stravaid
else: else:

6
rowers/tpstuff.py
View File

@@ -283,7 +283,6 @@ def uploadactivity(access_token,filename,description='',
with open("media/tperrors.log","a") as errorlog: with open("media/tperrors.log","a") as errorlog:
errorlog.write(str(resp.status_code)) errorlog.write(str(resp.status_code))
errorlog.write("\r\n") errorlog.write("\r\n")
print "noot"
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+"\r\n") errorlog.write(timestr+"\r\n")
errorlog.write("\r\n") errorlog.write("\r\n")
@@ -296,14 +295,13 @@ def uploadactivity(access_token,filename,description='',
errorlog.write("\r\n") errorlog.write("\r\n")
return 0,resp.reason,resp.status_code,headers return 0,resp.reason,resp.status_code,headers
else: else:
print resp.json()
return resp.json()[0]["Id"],"ok",200,"" return resp.json()[0]["Id"],"ok",200,""
return 0 return 0
def workout_tp_upload(user,w): def workout_tp_upload(user,w):
message = "" message = "Uploading to TrainingPeaks"
tpid = 0 tpid = 0
r = w.user r = w.user
@@ -333,7 +331,7 @@ def workout_tp_upload(user,w):
tpid = res tpid = res
w.save() w.save()
os.remove(tcxfile) os.remove(tcxfile)
return '',tpid return 'Successfully synchronized to TrainingPeaks',tpid
else: # no tcxfile else: # no tcxfile
message = "Upload to TrainingPeaks failed" message = "Upload to TrainingPeaks failed"

4
rowers/underarmourstuff.py
View File

@@ -401,7 +401,7 @@ def get_userid(access_token):
return res return res
def workout_ua_upload(user,w): def workout_ua_upload(user,w):
message = "" message = "Uploading to MapMyFitness"
uaid = 0 uaid = 0
r = w.user r = w.user
@@ -438,7 +438,7 @@ def workout_ua_upload(user,w):
uaid = getidfromresponse(response) uaid = getidfromresponse(response)
w.uploadedtounderarmour = uaid w.uploadedtounderarmour = uaid
w.save() w.save()
return '',uaid return 'Successfully synchronized with MapMyFitness',uaid
else: else:
s = response s = response
message = "Something went wrong in workout_underarmour_upload_view: %s - %s" % (s.reason,s.text) message = "Something went wrong in workout_underarmour_upload_view: %s - %s" % (s.reason,s.text)

74
rowers/views.py
View File

@@ -5855,61 +5855,89 @@ def workout_upload_view(request,message="",
# upload to C2 # upload to C2
if (upload_to_c2): if (upload_to_c2):
try: try:
c2message,c2id = c2stuff.workout_c2_upload(request.user,w) message,id = c2stuff.workout_c2_upload(request.user,w)
except C2NoTokenError: except C2NoTokenError:
pass id = 0
message = "Something went wrong with the Concept2 sync"
if id>1:
messages.info(request,message)
else:
messages.error(request,message)
if (upload_to_strava): if (upload_to_strava):
try: try:
stravamessage,stravaid = stravastuff.workout_strava_upload( message,id = stravastuff.workout_strava_upload(
request.user,w request.user,w
) )
except StravaNoTokenError: except StravaNoTokenError:
pass id = 0
message = "Please connect to Strava first"
if id>1:
messages.info(request,message)
else:
messages.error(request,message)
if (upload_to_st): if (upload_to_st):
try: try:
stmessage,stid = sporttracksstuff.workout_sporttracks_upload( message,id = sporttracksstuff.workout_sporttracks_upload(
request.user,w request.user,w
) )
except SportTracksNoTokenError: except SportTracksNoTokenError:
pass message = "Please connect to SportTracks first"
id = 0
if id>1:
messages.info(request,message)
else:
messages.error(request,message)
if (upload_to_rk): if (upload_to_rk):
try: try:
rkmessage,rkid = runkeeperstuff.workout_runkeeper_upload( message,id = runkeeperstuff.workout_runkeeper_upload(
request.user,w request.user,w
) )
except RunKeeperNoTokenError: except RunKeeperNoTokenError:
pass message = "Please connect to Runkeeper first"
id = 0
if id>1:
messages.info(request,message)
else:
messages.error(request,message)
if (upload_to_ua): if (upload_to_ua):
try: try:
uamessage,uaid = underarmourstuff.workout_ua_upload( message,id = underarmourstuff.workout_ua_upload(
request.user,w request.user,w
) )
except UnderArmourNoTokenError: except UnderArmourNoTokenError:
pass message = "Please connect to MapMyFitness first"
id = 0
if id>1:
messages.info(request,message)
else:
messages.error(request,message)
if (upload_to_tp): if (upload_to_tp):
try: try:
tpmessage,tpid = tpstuff.workout_tp_upload( message,id = tpstuff.workout_tp_upload(
request.user,w request.user,w
) )
except TPNoTokenError: except TPNoTokenError:
pass message = "Please connect to TrainingPeaks first"
id = 0
if message: if id>1:
url = reverse(workout_edit_view, messages.info(request,message)
kwargs={ else:
'message':message, messages.error(request,message)
'id':w.id,
})
else: url = reverse(workout_edit_view,
url = reverse(workout_edit_view, kwargs = {
kwargs = { 'id':w.id,
'id':w.id, })
})
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
response = render(request, response = render(request,