fix update_records
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import time
|
import time
|
||||||
|
from rowers.utils import dologging
|
||||||
|
|
||||||
# low level methods
|
# low level methods
|
||||||
def coordinate_in_path(latitude, longitude, p):
|
def coordinate_in_path(latitude, longitude, p):
|
||||||
@@ -32,47 +32,26 @@ def time_in_path(df, p, maxmin='max', getall=False, name='unknown', logfile=None
|
|||||||
|
|
||||||
if len(df[b == 2]):
|
if len(df[b == 2]):
|
||||||
if logfile is not None: # pragma: no cover
|
if logfile is not None: # pragma: no cover
|
||||||
t = time.localtime()
|
s = '{name} {maxmin} {getall} {nrpasses} passes found'.format(
|
||||||
timestamp = bytes('{t}'.format(
|
name = name,
|
||||||
t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8')
|
maxmin = maxmin,
|
||||||
with open(logfile, 'ab') as f:
|
getall = getall,
|
||||||
f.write(b'\n')
|
nrpasses = len(df[b==2]),
|
||||||
f.write(timestamp)
|
)
|
||||||
f.write(b' ')
|
dologging(logfile,s)
|
||||||
f.write(bytes(name, 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(maxmin, 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(str(getall), 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(str(len(df[b == 2])), 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
if len(df[b == 2]) > 1:
|
|
||||||
f.write(b' passes found')
|
|
||||||
else:
|
|
||||||
f.write(b' pass found')
|
|
||||||
if getall: # pragma: no cover
|
if getall: # pragma: no cover
|
||||||
return df[b == 2]['time'], df[b == 2]['cum_dist']
|
return df[b == 2]['time'], df[b == 2]['cum_dist']
|
||||||
else:
|
else:
|
||||||
return df[b == 2]['time'].min(), df[b == 2]['cum_dist'].min()
|
return df[b == 2]['time'].min(), df[b == 2]['cum_dist'].min()
|
||||||
|
|
||||||
if logfile is not None: # pragma: no cover
|
if logfile is not None: # pragma: no cover
|
||||||
t = time.localtime()
|
s = '{name} {maxmin} {getall} {nrpasses} pass not found'.format(
|
||||||
timestamp = bytes('{t}'.format(
|
name = name,
|
||||||
t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8')
|
maxmin = maxmin,
|
||||||
with open(logfile, 'ab') as f:
|
getall = getall,
|
||||||
f.write(b'\n')
|
nrpasses = len(df[b==2])
|
||||||
f.write(timestamp)
|
)
|
||||||
f.write(b' ')
|
dologging(logfile,s)
|
||||||
f.write(bytes(name, 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(maxmin, 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(str(getall), 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(bytes(str(len(df[b == 2])), 'utf-8'))
|
|
||||||
f.write(b' ')
|
|
||||||
f.write(b' pass not found')
|
|
||||||
raise InvalidTrajectoryError(
|
raise InvalidTrajectoryError(
|
||||||
"Trajectory doesn't go through path") # pragma: no cover
|
"Trajectory doesn't go through path") # pragma: no cover
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
|
import ssl
|
||||||
|
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import pytz
|
import pytz
|
||||||
@@ -308,6 +310,7 @@ c2url = 'https://www.concept2.com/indoor-rowers/racing/records/world?machine=row
|
|||||||
|
|
||||||
|
|
||||||
def update_records(url=c2url, verbose=True):
|
def update_records(url=c2url, verbose=True):
|
||||||
|
ssl._create_default_https_context = ssl._create_unverified_context
|
||||||
try:
|
try:
|
||||||
dfs = pd.read_html(url, attrs={'class': 'views-table'})
|
dfs = pd.read_html(url, attrs={'class': 'views-table'})
|
||||||
df = dfs[0]
|
df = dfs[0]
|
||||||
|
|||||||
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