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

Merge branch 'hotfix/v2.98'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-22 20:14:24 +02:00
parent 0ef6840d22 969077fe22
commit dd43805c08
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/stravastuff.py
View File

@@ -250,7 +250,12 @@ def createstravaworkoutdata(w):
row = rowingdata(filename) row = rowingdata(filename)
tcxfilename = filename[:-4]+'.tcx' tcxfilename = filename[:-4]+'.tcx'
row.exporttotcx(tcxfilename,notes=w.notes+'\n from '+w.workoutsource+' via rowsandall.com') try:
newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
except TypeError:
newnotes = 'from '+w.workoutsource+' via rowsandall.com'
row.exporttotcx(tcxfilename,notes=newnotes)
gzfilename = tcxfilename+'.gz' gzfilename = tcxfilename+'.gz'
with file(tcxfilename,'rb') as inF: with file(tcxfilename,'rb') as inF:
s = inF.read() s = inF.read()

14
rowers/tpstuff.py
View File

@@ -218,16 +218,18 @@ def getidfromresponse(response):
def createtpworkoutdata(w): def createtpworkoutdata(w):
filename = w.csvfilename filename = w.csvfilename
row = rowingdata(filename)
tcxfilename = filename[:-4]+'.tcx'
try: try:
row = rowingdata(filename) newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
tcxfilename = filename[:-4]+'.tcx' except TypeError:
row.exporttotcx(tcxfilename,notes=w.notes+'\n from '+w.workoutsource+' via rowsandall.com') newnotes = 'from '+w.workoutsource+' via rowsandall.com'
return tcxfilename
except: row.exporttotcx(tcxfilename,notes=newnotes)
tcxfilename = 0
return tcxfilename return tcxfilename
def tp_check(access_token): def tp_check(access_token):
headers = { headers = {
"Content-Type": "application/json", "Content-Type": "application/json",