diff --git a/rowers/courseutils.py b/rowers/courseutils.py index 9393ddea..90a1a03e 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -1,5 +1,5 @@ import time - +from rowers.utils import dologging # low level methods 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 logfile is not None: # pragma: no cover - t = time.localtime() - timestamp = bytes('{t}'.format( - t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8') - with open(logfile, 'ab') as f: - f.write(b'\n') - f.write(timestamp) - f.write(b' ') - 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') + s = '{name} {maxmin} {getall} {nrpasses} passes found'.format( + name = name, + maxmin = maxmin, + getall = getall, + nrpasses = len(df[b==2]), + ) + dologging(logfile,s) if getall: # pragma: no cover return df[b == 2]['time'], df[b == 2]['cum_dist'] else: return df[b == 2]['time'].min(), df[b == 2]['cum_dist'].min() if logfile is not None: # pragma: no cover - t = time.localtime() - timestamp = bytes('{t}'.format( - t=time.strftime('%b-%d-%Y_%H%M', t)), 'utf-8') - with open(logfile, 'ab') as f: - f.write(b'\n') - f.write(timestamp) - f.write(b' ') - 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') + s = '{name} {maxmin} {getall} {nrpasses} pass not found'.format( + name = name, + maxmin = maxmin, + getall = getall, + nrpasses = len(df[b==2]) + ) + dologging(logfile,s) raise InvalidTrajectoryError( "Trajectory doesn't go through path") # pragma: no cover diff --git a/rowers/models.py b/rowers/models.py index 63da2915..b2053e0c 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -26,6 +26,8 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin import os import json +import ssl + import re 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): + ssl._create_default_https_context = ssl._create_unverified_context try: dfs = pd.read_html(url, attrs={'class': 'views-table'}) df = dfs[0] diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 40e73211..fde66471 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ