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

replaced mktime with arrow.get

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-04 13:24:06 +02:00
parent a5639e734f
commit 75a3292b54
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rowers/views.py
View File

@@ -3,6 +3,7 @@ import colorsys
import timestring import timestring
import zipfile import zipfile
import bleach import bleach
import arrow
import pytz import pytz
import operator import operator
import warnings import warnings
@@ -464,7 +465,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
except: except:
title = 'Imported' title = 'Imported'
starttimeunix = mktime(rowdatetime.utctimetuple()) starttimeunix = arrow.get(rowdatetime).timestamp
res = make_cumvalues(0.1*strokedata['t']) res = make_cumvalues(0.1*strokedata['t'])
cum_time = res[0] cum_time = res[0]
@@ -618,7 +619,8 @@ def add_workout_from_runkeeperdata(user,importid,data):
except: except:
rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = mktime(rowdatetime.utctimetuple()) starttimeunix = arrow.get(rowdatetime).timestamp
#starttimeunix = mktime(rowdatetime.utctimetuple())
starttimeunix += utcoffset*3600 starttimeunix += utcoffset*3600
@@ -670,9 +672,17 @@ def add_workout_from_runkeeperdata(user,importid,data):
distseries = pd.Series(distance,index=times_distance) distseries = pd.Series(distance,index=times_distance)
distseries = distseries.groupby(distseries.index).first() distseries = distseries.groupby(distseries.index).first()
latseries = pd.Series(latcoord,index=times_location) latseries = pd.Series(latcoord,index=times_location)
try:
latseries = latseries.groupby(latseries.index).first() latseries = latseries.groupby(latseries.index).first()
except TypeError:
latseries = 0.0*distseries
lonseries = pd.Series(loncoord,index=times_location) lonseries = pd.Series(loncoord,index=times_location)
try:
lonseries = lonseries.groupby(lonseries.index).first() lonseries = lonseries.groupby(lonseries.index).first()
except TypeError:
lonseries = 0.0*distseries
spmseries = pd.Series(spm,index=times_spm) spmseries = pd.Series(spm,index=times_spm)
spmseries = spmseries.groupby(spmseries.index).first() spmseries = spmseries.groupby(spmseries.index).first()
hrseries = pd.Series(hr,index=times_hr) hrseries = pd.Series(hr,index=times_hr)
@@ -762,10 +772,6 @@ def add_workout_from_stdata(user,importid,data):
except: except:
comments = '' comments = ''
try:
thetimezone = tz(data['timezone'])
except:
thetimezone = 'UTC'
r = getrower(user) r = getrower(user)
try: try:
@@ -781,8 +787,7 @@ def add_workout_from_stdata(user,importid,data):
except: except:
rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = mktime(rowdatetime.utctimetuple()) starttimeunix = arrow.get(rowdatetime).timestamp
try: try:
title = data['name'] title = data['name']
@@ -944,7 +949,8 @@ def add_workout_from_underarmourdata(user,importid,data):
except: except:
rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = mktime(rowdatetime.utctimetuple()) starttimeunix = arrow.get(rowdatetime).timestamp
#starttimeunix = mktime(rowdatetime.utctimetuple())
try: try:
@@ -4783,7 +4789,8 @@ def workout_downloadwind_view(request,id=0,
startdatetime = dateutil.parser.parse("{}, {}".format(row.date, startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
row.starttime)) row.starttime))
starttimeunix = int(mktime(startdatetime.utctimetuple())) starttimeunix = int(arrow.get(startdatetime).timestamp)
#starttimeunix = int(mktime(startdatetime.utctimetuple()))
avgtime = starttimeunix+avgtime avgtime = starttimeunix+avgtime
winddata = get_wind_data(avglat,avglon,avgtime) winddata = get_wind_data(avglat,avglon,avgtime)
windspeed = winddata[0] windspeed = winddata[0]
@@ -4852,7 +4859,8 @@ def workout_downloadmetar_view(request,id=0,
startdatetime = dateutil.parser.parse("{}, {}".format(row.date, startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
row.starttime)) row.starttime))
starttimeunix = int(mktime(startdatetime.utctimetuple())) starttimeunix = arrow.get(startdatetime).timestamp
#starttimeunix = int(mktime(startdatetime.utctimetuple()))
avgtime = starttimeunix+avgtime avgtime = starttimeunix+avgtime
winddata = get_metar_data(airportcode,avgtime) winddata = get_metar_data(airportcode,avgtime)
windspeed = winddata[0] windspeed = winddata[0]