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

Merge branch 'develop' into feature/metrics

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-01 15:24:02 +01:00
parent 9b653d4d1b 0ac7e5ee95
commit 937a493d5b
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/c2stuff.py
View File

@@ -821,7 +821,10 @@ def get_userid(access_token):
return 0 return 0
me_json = response.json() try:
me_json = response.json()
except JSONDecodeError:
return 0
try: try:
res = me_json['data']['id'] res = me_json['data']['id']
except KeyError: except KeyError:

16
rowers/uploads.py
View File

@@ -506,6 +506,7 @@ def do_sync(w,options):
try: try:
if options['stravaid'] != 0: if options['stravaid'] != 0:
w.uploadedtostrava = options['stravaid'] w.uploadedtostrava = options['stravaid']
options['upload_to_Strava'] = False
w.save() w.save()
except KeyError: except KeyError:
pass pass
@@ -524,14 +525,13 @@ def do_sync(w,options):
if ('upload_to_Strava' in options and not options['upload_to_Strava']): if ('upload_to_Strava' in options and not options['upload_to_Strava']):
pass pass
else: else:
if options['stravaid'] != 0: try:
try: message,id = stravastuff.workout_strava_upload(
message,id = stravastuff.workout_strava_upload( w.user.user,w
w.user.user,w )
) except NoTokenError:
except NoTokenError: id = 0
id = 0 message = "Please connect to Strava first"
message = "Please connect to Strava first"
if ('upload_to_SportTracks' in options and options['upload_to_SportTracks']) or (w.user.sporttracks_auto_export and isprorower(w.user)): if ('upload_to_SportTracks' in options and options['upload_to_SportTracks']) or (w.user.sporttracks_auto_export and isprorower(w.user)):