some changes
This commit is contained in:
Sander Roosendaal
@@ -11,8 +11,6 @@ import time
|
||||
from time import strftime
|
||||
|
||||
|
||||
from django_mailbox.models import Message,Mailbox,MessageAttachment
|
||||
|
||||
import django_rq
|
||||
queue = django_rq.get_queue('default')
|
||||
queuelow = django_rq.get_queue('low')
|
||||
@@ -212,157 +210,6 @@ def get_strava_workout_list(user,limit_n=0):
|
||||
return s
|
||||
|
||||
|
||||
# gets all new Strava workouts for a rower
|
||||
def get_strava_workouts(rower): # pragma: no cover
|
||||
try:
|
||||
thetoken = strava_open(rower.user)
|
||||
except NoTokenError:
|
||||
return 0
|
||||
|
||||
res = get_strava_workout_list(rower.user,limit_n=10)
|
||||
|
||||
if (res.status_code != 200):
|
||||
return 0
|
||||
else:
|
||||
stravaids = [int(item['id']) for item in res.json()]
|
||||
stravadata = [{
|
||||
'id':int(item['id']),
|
||||
'elapsed_time':item['elapsed_time'],
|
||||
'start_date':item['start_date'],
|
||||
} for item in res.json()]
|
||||
|
||||
alldata = {}
|
||||
for item in res.json():
|
||||
alldata[item['id']] = item
|
||||
|
||||
|
||||
wfailed = Workout.objects.filter(user=rower,uploadedtostrava=-1)
|
||||
|
||||
for w in wfailed:
|
||||
for item in stravadata:
|
||||
elapsed_time = item['elapsed_time']
|
||||
start_date = item['start_date']
|
||||
stravaid = item['id']
|
||||
|
||||
if arrow.get(start_date) == arrow.get(w.startdatetime):
|
||||
dd = datetime.min + timedelta(
|
||||
seconds=int(elapsed_time)
|
||||
)
|
||||
|
||||
|
||||
delta = datetime.combine(datetime.min,datetime.time(dd))-datetime.combine(datetime.min,w.duration)
|
||||
|
||||
if delta < timedelta(minutes=2):
|
||||
w.uploadedtostrava = int(stravaid)
|
||||
w.save()
|
||||
|
||||
knownstravaids = [
|
||||
w.uploadedtostrava for w in Workout.objects.filter(user=rower)
|
||||
]
|
||||
|
||||
tombstones = [
|
||||
t.uploadedtostrava for t in TombStone.objects.filter(user=rower)
|
||||
]
|
||||
|
||||
knownstravaids = uniqify(knownstravaids+tombstones)
|
||||
|
||||
newids = [stravaid for stravaid in stravaids if not stravaid in knownstravaids]
|
||||
|
||||
for stravaid in newids:
|
||||
result = create_async_workout(alldata,rower.user,stravaid)
|
||||
|
||||
return 1
|
||||
|
||||
def create_async_workout(alldata,user,stravaid,debug=False):
|
||||
data = alldata[stravaid]
|
||||
r = Rower.objects.get(user=user)
|
||||
distance = data['distance']
|
||||
stravaid = data['id']
|
||||
try:
|
||||
workouttype = mytypes.stravamappinginv[data['type']]
|
||||
except: # pragma: no cover
|
||||
workouttype = 'other'
|
||||
|
||||
if workouttype not in [x[0] for x in Workout.workouttypes]: # pragma: no cover
|
||||
workouttype = 'other'
|
||||
|
||||
if workouttype.lower() == 'rowing': # pragma: no cover
|
||||
workouttype = 'rower'
|
||||
if 'summary_polyline' in data['map']:
|
||||
workouttype = 'water'
|
||||
|
||||
|
||||
try:
|
||||
comments = data['comments']
|
||||
except:
|
||||
comments = ' '
|
||||
|
||||
try:
|
||||
thetimezone = tz(data['timezone'])
|
||||
except:
|
||||
thetimezone = 'UTC'
|
||||
|
||||
try:
|
||||
rowdatetime = iso8601.parse_date(data['date_utc'])
|
||||
except KeyError:
|
||||
rowdatetime = iso8601.parse_date(data['start_date'])
|
||||
except ParseError: # pragma: no cover
|
||||
rowdatetime = iso8601.parse_date(data['date'])
|
||||
|
||||
try:
|
||||
c2intervaltype = data['workout_type']
|
||||
|
||||
except KeyError: # pragma: no cover
|
||||
c2intervaltype = ''
|
||||
|
||||
try:
|
||||
title = data['name']
|
||||
except KeyError: # pragma: no cover
|
||||
title = ""
|
||||
try:
|
||||
t = data['comments'].split('\n', 1)[0]
|
||||
title += t[:20]
|
||||
except:
|
||||
title = ''
|
||||
|
||||
workoutdate = rowdatetime.astimezone(
|
||||
pytz.timezone(thetimezone)
|
||||
).strftime('%Y-%m-%d')
|
||||
|
||||
starttime = rowdatetime.astimezone(
|
||||
pytz.timezone(thetimezone)
|
||||
).strftime('%H:%M:%S')
|
||||
|
||||
totaltime = data['elapsed_time']
|
||||
duration = dataprep.totaltime_sec_to_string(totaltime)
|
||||
|
||||
weightcategory = 'hwt'
|
||||
|
||||
# Create CSV file name and save data to CSV file
|
||||
csvfilename ='media/mailbox_attachments/{code}_{importid}.csv'.format(
|
||||
importid=stravaid,
|
||||
code = uuid4().hex[:16]
|
||||
)
|
||||
|
||||
|
||||
|
||||
# Check if workout has stroke data, and get the stroke data
|
||||
|
||||
starttimeunix = arrow.get(rowdatetime).timestamp()
|
||||
|
||||
result = handle_strava_import_stroke_data(
|
||||
title,
|
||||
user.email,
|
||||
r.stravatoken,
|
||||
stravaid,
|
||||
starttimeunix,
|
||||
csvfilename,
|
||||
workouttype = workouttype,
|
||||
boattype = '1x'
|
||||
)
|
||||
|
||||
return 1
|
||||
|
||||
from rowers.utils import get_strava_stream
|
||||
|
||||
def async_get_workout(user,stravaid):
|
||||
@@ -559,174 +406,3 @@ def workout_strava_upload(user,w, quick=False,asynchron=True):
|
||||
os.remove(tcxfile)
|
||||
return message,stravaid
|
||||
return message,stravaid # pragma: no cover
|
||||
|
||||
|
||||
|
||||
def handle_strava_import_stroke_data(title,
|
||||
useremail,
|
||||
stravatoken,
|
||||
stravaid,
|
||||
starttimeunix,
|
||||
csvfilename,debug=True,
|
||||
workouttype = 'rower',
|
||||
boattype = '1x',
|
||||
**kwargs):
|
||||
# ready to fetch. Hurray
|
||||
|
||||
fetchresolution = 'high'
|
||||
series_type = 'time'
|
||||
authorizationstring = str('Bearer ' + stravatoken)
|
||||
headers = {'Authorization': authorizationstring,
|
||||
'user-agent': 'sanderroosendaal',
|
||||
'Content-Type': 'application/json',
|
||||
'resolution': 'medium',}
|
||||
url = "https://www.strava.com/api/v3/activities/"+str(stravaid)
|
||||
workoutsummary = requests.get(url,headers=headers).json()
|
||||
|
||||
workoutsummary['timezone'] = "Etc/UTC"
|
||||
startdatetime = workoutsummary['start_date']
|
||||
|
||||
r = type('Rower', (object,), {"stravatoken": stravatoken})
|
||||
|
||||
spm = get_strava_stream(r,'cadence',stravaid)
|
||||
t = get_strava_stream(r,'time',stravaid)
|
||||
|
||||
try:
|
||||
hr = get_strava_stream(r,'heartrate',stravaid)
|
||||
except JSONDecodeError: # pragma: no cover
|
||||
hr = 0*spm
|
||||
|
||||
try:
|
||||
velo = get_strava_stream(r,'velocity_smooth',stravaid)
|
||||
except JSONDecodeError: # pragma: no cover
|
||||
velo = 0*t
|
||||
|
||||
try:
|
||||
d = get_strava_stream(r,'distance',stravaid)
|
||||
except JSONDecodeError: # pragma: no cover
|
||||
d = 0*t
|
||||
|
||||
try:
|
||||
coords = get_strava_stream(r,'latlng',stravaid)
|
||||
except JSONDecodeError: # pragma: no cover
|
||||
coords = 0*t
|
||||
try:
|
||||
power = get_strava_stream(r,'watts',stravaid)
|
||||
except JSONDecodeError: # pragma: no cover
|
||||
power = 0*t
|
||||
|
||||
if t is not None:
|
||||
nr_rows = len(t)
|
||||
else: # pragma: no cover
|
||||
return 0
|
||||
|
||||
if nr_rows == 0: # pragma: no cover
|
||||
return 0
|
||||
|
||||
if d is None: # pragma: no cover
|
||||
d = 0*t
|
||||
|
||||
if spm is None: # pragma: no cover
|
||||
spm = np.zeros(nr_rows)
|
||||
|
||||
if power is None: # pragma: no cover
|
||||
power = np.zeros(nr_rows)
|
||||
|
||||
if hr is None: # pragma: no cover
|
||||
hr = np.zeros(nr_rows)
|
||||
|
||||
if velo is None: # pragma: no cover
|
||||
velo = np.zeros(nr_rows)
|
||||
|
||||
|
||||
f = np.diff(t).mean()
|
||||
if f != 0:
|
||||
windowsize = 2*(int(10./(f)))+1
|
||||
else: # pragma: no cover
|
||||
windowsize = 1
|
||||
|
||||
if windowsize > 3 and windowsize < len(velo):
|
||||
velo2 = savgol_filter(velo,windowsize,3)
|
||||
else: # pragma: no cover
|
||||
velo2 = velo
|
||||
|
||||
if coords is not None:
|
||||
try:
|
||||
lat = coords[:,0]
|
||||
lon = coords[:,1]
|
||||
if lat.std() == 0 and lon.std() == 0 and workouttype == 'water': # pragma: no cover
|
||||
workouttype = 'rower'
|
||||
except IndexError: # pragma: no cover
|
||||
lat = np.zeros(len(t))
|
||||
lon = np.zeros(len(t))
|
||||
if workouttype == 'water':
|
||||
workouttype = 'rower'
|
||||
else: # pragma: no cover
|
||||
lat = np.zeros(len(t))
|
||||
lon = np.zeros(len(t))
|
||||
if workouttype == 'water':
|
||||
workouttype = 'rower'
|
||||
|
||||
strokelength = velo*60./(spm)
|
||||
strokelength[np.isinf(strokelength)] = 0.0
|
||||
|
||||
pace = 500./(1.0*velo2)
|
||||
pace[np.isinf(pace)] = 0.0
|
||||
|
||||
unixtime = starttimeunix+t
|
||||
|
||||
strokedistance = 60.*velo2/spm
|
||||
|
||||
if workouttype == 'rower' and pd.Series(power).mean() == 0: # pragma: no cover
|
||||
power = 2.8*(velo2**3)
|
||||
|
||||
nr_strokes = len(t)
|
||||
|
||||
df = pd.DataFrame({'TimeStamp (sec)':unixtime,
|
||||
' ElapsedTime (sec)':t,
|
||||
' Horizontal (meters)':d,
|
||||
' Stroke500mPace (sec/500m)':pace,
|
||||
' Cadence (stokes/min)':spm,
|
||||
' HRCur (bpm)':hr,
|
||||
' latitude':lat,
|
||||
' longitude':lon,
|
||||
' StrokeDistance (meters)':strokelength,
|
||||
'cum_dist':d,
|
||||
' DragFactor':np.zeros(nr_strokes),
|
||||
' DriveLength (meters)':np.zeros(nr_strokes),
|
||||
' StrokeDistance (meters)':strokedistance,
|
||||
' DriveTime (ms)':np.zeros(nr_strokes),
|
||||
' StrokeRecoveryTime (ms)':np.zeros(nr_strokes),
|
||||
' AverageDriveForce (lbs)':np.zeros(nr_strokes),
|
||||
' PeakDriveForce (lbs)':np.zeros(nr_strokes),
|
||||
' lapIdx':np.zeros(nr_strokes),
|
||||
' Power (watts)':power,
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
df.sort_values(by='TimeStamp (sec)',ascending=True)
|
||||
|
||||
res = df.to_csv(csvfilename,index_label='index')
|
||||
|
||||
workoutsbox = Mailbox.objects.filter(name='workouts')[0]
|
||||
|
||||
body = """stravaid {stravaid}
|
||||
workouttype {workouttype}
|
||||
boattype {boattype}""".format(
|
||||
stravaid=stravaid,
|
||||
workouttype=workouttype,
|
||||
boattype=boattype
|
||||
)
|
||||
|
||||
msg = Message(mailbox=workoutsbox,
|
||||
from_header=useremail,
|
||||
subject=title,
|
||||
body=body)
|
||||
msg.save()
|
||||
|
||||
a = MessageAttachment(message=msg,document=csvfilename[6:])
|
||||
a.save()
|
||||
|
||||
return res
|
||||
|
||||
Reference in New Issue
Block a user