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

fixes in c2_auto_export

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-16 12:59:45 +01:00
parent 6382e30585
commit d5ce50ddcc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
requirements.txt
View File

@@ -3,6 +3,7 @@ apipkg==1.5
appdirs==1.4.3 appdirs==1.4.3
arcgis==1.6.0 arcgis==1.6.0
arrow==1.0.2 arrow==1.0.2
asgiref==3.3.1
asn1crypto==0.24.0 asn1crypto==0.24.0
atomicwrites==1.3.0 atomicwrites==1.3.0
attrs==19.1.0 attrs==19.1.0
@@ -12,8 +13,8 @@ billiard==3.6.0.0
bleach==3.1.0 bleach==3.1.0
bokeh==2.2.3 bokeh==2.2.3
boto==2.49.0 boto==2.49.0
boto3==1.17.12 boto3==1.17.28
botocore==1.20.12 botocore==1.20.28
bottle==0.12.18 bottle==0.12.18
braintree==3.55.0 braintree==3.55.0
cairocffi==1.0.2 cairocffi==1.0.2

13
rowers/uploads.py
View File

@@ -526,8 +526,9 @@ def make_private(w,options):
def do_sync(w,options, quick=False): def do_sync(w,options, quick=False):
do_strava_export = w.user.strava_auto_export
try: try:
upload_to_strava = options['upload_to_Strava'] upload_to_strava = options['upload_to_Strava'] or do_strava_export
except KeyError: except KeyError:
upload_to_strava = False upload_to_strava = False
@@ -535,6 +536,7 @@ def do_sync(w,options, quick=False):
if options['stravaid'] != 0 and options['stravaid'] != '': if options['stravaid'] != 0 and options['stravaid'] != '':
w.uploadedtostrava = options['stravaid'] w.uploadedtostrava = options['stravaid']
upload_to_strava = False upload_to_strava = False
do_strava_export = False
w.save() w.save()
except KeyError: except KeyError:
pass pass
@@ -546,9 +548,9 @@ def do_sync(w,options, quick=False):
except KeyError: except KeyError:
pass pass
do_c2_export = w.user.c2_auto_export
try: try:
upload_to_c2 = options['upload_to_C2'] upload_to_c2 = options['upload_to_C2'] or do_c2_export
except KeyError: except KeyError:
upload_to_c2 = False upload_to_c2 = False
@@ -556,6 +558,7 @@ def do_sync(w,options, quick=False):
if options['c2id'] != 0 and options['c2id'] != '': if options['c2id'] != 0 and options['c2id'] != '':
w.uploadedtoc2 = options['c2id'] w.uploadedtoc2 = options['c2id']
upload_to_c2 = False upload_to_c2 = False
do_c3_export = False
w.save() w.save()
except KeyError: except KeyError:
pass pass
@@ -570,7 +573,7 @@ def do_sync(w,options, quick=False):
if w.duplicate: if w.duplicate:
return 0 return 0
if ('upload_to_C2' in options and upload_to_c2) or (w.user.c2_auto_export): if do_c2_export:
try: try:
message,id = c2stuff.workout_c2_upload(w.user.user,w,asynchron=True) message,id = c2stuff.workout_c2_upload(w.user.user,w,asynchron=True)
except NoTokenError: except NoTokenError:
@@ -579,7 +582,7 @@ def do_sync(w,options, quick=False):
except: except:
pass pass
if ('upload_to_Strava' in options and upload_to_strava) or (w.user.strava_auto_export): if do_strava_export:
try: try:
message,id = stravastuff.workout_strava_upload( message,id = stravastuff.workout_strava_upload(
w.user.user,w,quick=quick,asynchron=True, w.user.user,w,quick=quick,asynchron=True,