Merge branch 'release/v22.1.8'
This commit is contained in:
@@ -3771,24 +3771,11 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid,
|
||||
url = "https://www.strava.com/api/v3/activities/"+str(stravaid)
|
||||
response = requests.get(url, headers=headers)
|
||||
if response.status_code != 200: # pragma: no cover
|
||||
tstamp = time.localtime()
|
||||
timestamp = time.strftime('%b-%d-%Y_%H%M', tstamp)
|
||||
with open('stravalog.log', 'a') as f:
|
||||
f.write('\n')
|
||||
f.write(timestamp)
|
||||
f.write(' ')
|
||||
f.write(url)
|
||||
f.write(' ')
|
||||
f.write(json.dumps(headers))
|
||||
f.write(' ')
|
||||
f.write(authorizationstring)
|
||||
f.write(' ')
|
||||
f.write('handle_get_strava_file response code {code}\n'.format(
|
||||
dologging('stravalog.log', 'handle_get_strava_file response code {code}\n'.format(
|
||||
code=response.status_code))
|
||||
try:
|
||||
f.write('Response json {json}\n'.format(json=response.json()))
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
dologging('stravalog.log','Response json {json}\n'.format(json=response.json()))
|
||||
pass
|
||||
|
||||
return 0
|
||||
|
||||
@@ -4001,8 +3988,28 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid,
|
||||
try:
|
||||
row.write_csv(csvfilename, compressed=False)
|
||||
except ComputeError:
|
||||
dologging('stravalog.log','polars not working')
|
||||
dologging('stravalog.log',{'TimeStamp (sec)': unixtime,
|
||||
' Horizontal (meters)': dist2,
|
||||
' Cadence (stokes/min)': spm,
|
||||
' HRCur (bpm)': hr,
|
||||
' longitude': loncoord,
|
||||
' latitude': latcoord,
|
||||
' Stroke500mPace (sec/500m)': pace,
|
||||
' Power (watts)': power,
|
||||
' DragFactor': np.zeros(nr_rows),
|
||||
' DriveLength (meters)': np.zeros(nr_rows),
|
||||
' StrokeDistance (meters)': strokelength,
|
||||
' DriveTime (ms)': np.zeros(nr_rows),
|
||||
' StrokeRecoveryTime (ms)': np.zeros(nr_rows),
|
||||
' AverageDriveForce (lbs)': np.zeros(nr_rows),
|
||||
' PeakDriveForce (lbs)': np.zeros(nr_rows),
|
||||
' lapIdx': lapidx,
|
||||
' ElapsedTime (sec)': seconds,
|
||||
'cum_dist': dist2,
|
||||
})
|
||||
row = rowingdata.rowingdata(df=df.to_pandas())
|
||||
row.write_csv(filename)
|
||||
row.write_csv(csvfilename)
|
||||
|
||||
# summary = row.allstats()
|
||||
# maxdist = df['cum_dist'].max()
|
||||
|
||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user