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

Merge branch 'release/v9.87'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-08 16:55:29 +02:00
parent 758a5046c4 f5cf303f4c
commit 4c868b9dcb
5 changed files with 2541 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
b90680ee-35d5-4633-9974-fdc4bba4c68f.tcx
+2523
View File
File diff suppressed because it is too large Load Diff
rowers/dataprep.py
+8 -9
View File
@@ -1205,7 +1205,10 @@ def parsenonpainsled(fileformat,f2,summary):
fileformat = fileformat+'v'+str(empowerfirmware) fileformat = fileformat+'v'+str(empowerfirmware)
else: else:
fileformat = 'speedcoach2v0' fileformat = 'speedcoach2v0'
summary = row.allstats() try:
summary = row.allstats()
except ZeroDivisionError:
summary = ''
# handle FIT # handle FIT
@@ -1225,18 +1228,14 @@ def handle_nonpainsled(f2, fileformat, summary=''):
inboard = 0.88 inboard = 0.88
hasrecognized = False hasrecognized = False
try: row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
except:
pass
# Handle c2log # Handle c2log
if (fileformat == 'c2log' or fileformat == 'rowprolog'): if (fileformat == 'c2log' or fileformat == 'rowprolog'):
return (0,0,0,0,0) return (0,'',0,0,'')
if not hasrecognized: if not hasrecognized:
return (0,0,0,0,0) return (0,'',0,0,'')
f_to_be_deleted = f2 f_to_be_deleted = f2
# should delete file # should delete file
@@ -1245,7 +1244,7 @@ def handle_nonpainsled(f2, fileformat, summary=''):
row2 = rrdata(df = row.df) row2 = rrdata(df = row.df)
row2.write_csv(f2, gzip=True) row2.write_csv(f2, gzip=True)
except: except:
return (0,0,0,0,0) return (0,'',0,0,'')
# os.remove(f2) # os.remove(f2)
try: try:
rowers/middleware.py
+1 -1
View File
@@ -1,6 +1,6 @@
from django.utils import timezone from django.utils import timezone
from rowers.models import Workout, PowerTimeFitnessMetric, Rower from rowers.models import Workout, PowerTimeFitnessMetric, Rower, PaidPlan
import datetime import datetime
from rowers.utils import myqueue from rowers.utils import myqueue
import django_rq import django_rq
rowers/tests/testdata/testdata.csv.gz
Vendored
BIN
View File
Binary file not shown.
rowers/weather.py
+9 -7
View File
@@ -50,7 +50,6 @@ def get_metar_data(airportcode,unixtime):
url += str(unixtime+3600) url += str(unixtime+3600)
url += "&stationString="+airportcode url += "&stationString="+airportcode
try: try:
s = requests.get(url) s = requests.get(url)
except: except:
@@ -60,13 +59,16 @@ def get_metar_data(airportcode,unixtime):
if s.ok: if s.ok:
doc = etree.fromstring(s.content) doc = etree.fromstring(s.content)
lengte = len(doc.xpath('data/METAR/station_id'))
print('Lengte ',lengte,int(lengte/2))
idnr = int(lengte/2)
try: try:
id = doc.xpath('data/METAR/station_id')[0].text id = doc.xpath('data/METAR/station_id')[idnr].text
temp_c = doc.xpath('data/METAR/temp_c')[0].text temp_c = doc.xpath('data/METAR/temp_c')[idnr].text
wind_dir = doc.xpath('data/METAR/wind_dir_degrees')[0].text wind_dir = doc.xpath('data/METAR/wind_dir_degrees')[idnr].text
wind_speed = doc.xpath('data/METAR/wind_speed_kt')[0].text wind_speed = doc.xpath('data/METAR/wind_speed_kt')[idnr].text
timestamp = doc.xpath('data/METAR/observation_time')[0].text timestamp = doc.xpath('data/METAR/observation_time')[idnr].text
rawtext = doc.xpath('data/METAR/raw_text')[0].text rawtext = doc.xpath('data/METAR/raw_text')[idnr].text
except IndexError: except IndexError:
message = 'Failed to download METAR data' message = 'Failed to download METAR data'
return [0,0,message,'',timestamp] return [0,0,message,'',timestamp]