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

commit

Browse Source
This commit is contained in:
Sander Roosendaal
2022-02-15 08:05:12 +01:00
parent 5b3d7fcf2c
commit 8af7ac8af4
71 changed files with 19992 additions and 19476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
rowers/nkimportutils.py
View File

@@ -12,11 +12,12 @@ from rowers.utils import dologging
import requests
import json
def strfdelta(tdelta):
try:
minutes, seconds = divmod(tdelta.seconds, 60)
tenths = int(tdelta.microseconds / 1e5)
except AttributeError: # pragma: no cover
except AttributeError: # pragma: no cover
minutes, seconds = divmod(tdelta.view(np.int64), 60e9)
seconds, rest = divmod(seconds, 1e9)
tenths = int(rest / 1e8)
@@ -29,19 +30,19 @@ def strfdelta(tdelta):
return res
def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None,
def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata=None,
workoutsource='nklinklogbook'):
csvfilename = 'media/{code}_{nkid}.csv.gz'.format(
nkid=nkid,
code = uuid4().hex[:16]
code=uuid4().hex[:16]
)
# dologging('nklog.log',csvfilename)
try:
userid=int(userid)
except TypeError: # pragma: no cover
userid = int(userid)
except TypeError: # pragma: no cover
userid = userid.id
strokedata.to_csv(csvfilename, index_label='index', compression='gzip')
@@ -51,32 +52,32 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
elapsedTime = data["elapsedTime"]
totalDistanceGps = data["totalDistanceGps"]
totalDistanceImp = data["totalDistanceImp"]
intervals = data["intervals"] # add intervals
intervals = data["intervals"] # add intervals
oarlockSessions = data["oarlockSessions"]
deviceId = data["deviceId"] # you could get the firmware version
deviceId = data["deviceId"] # you could get the firmware version
totalDistance = totalDistanceGps
useImpeller = False
if speedInput: # pragma: no cover
if speedInput: # pragma: no cover
totdalDistance = totalDistanceImp
useImpeller = True
summary = get_nk_allstats(data,strokedata)
summary = get_nk_allstats(data, strokedata)
speedInput = data['speedInput'] # 0 = GPS; 1 = Impeller
# oarlock inboard, length, boat name
if oarlockSessions:
oarlocksession = oarlockSessions[0] # should take seatIndex
oarlocksession = oarlockSessions[0] # should take seatIndex
boatName = oarlocksession["boatName"]
oarLength = oarlocksession["oarLength"] # cm
oarInboardLength = oarlocksession["oarInboardLength"] # cm
oarLength = oarlocksession["oarLength"] # cm
oarInboardLength = oarlocksession["oarInboardLength"] # cm
seatNumber = oarlocksession["seatNumber"]
try:
oarlockfirmware = oarlocksession["firmwareVersion"]
except KeyError:
oarlockfirmware = ''
else: # pragma: no cover
else: # pragma: no cover
boatName = ''
oarLength = 289
oarInboardLength = 88
@@ -88,17 +89,17 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
uploadoptions = {
'secret': UPLOAD_SERVICE_SECRET,
'user':userid,
'user': userid,
'file': csvfilename,
'title': title,
'workouttype': workouttype,
'boattype': boattype,
'nkid':nkid,
'nkid': nkid,
'inboard': oarInboardLength/100.,
'oarlength': oarLength/100.,
'summary':summary,
'oarlockfirmware':oarlockfirmware,
'elapsedTime': elapsedTime/1000., # in seconds
'summary': summary,
'oarlockfirmware': oarlockfirmware,
'elapsedTime': elapsedTime/1000., # in seconds
'totalDistance': totalDistance,
'useImpeller': useImpeller
}
@@ -109,14 +110,14 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'}
session.headers.update(newHeaders)
response = session.post(UPLOAD_SERVICE_URL,json=uploadoptions)
response = session.post(UPLOAD_SERVICE_URL, json=uploadoptions)
if response.status_code != 200: # pragma: no cover
return 0,response.text
if response.status_code != 200: # pragma: no cover
return 0, response.text
try:
workoutid = response.json()['id']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
workoutid = 1
# dologging('nklog.log','Workout ID {id}'.format(id=workoutid))
@@ -124,11 +125,12 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
# evt update workout summary
# return
return workoutid,""
return workoutid, ""
def get_nk_intervalstats(workoutdata,strokedata):
def get_nk_intervalstats(workoutdata, strokedata):
intervals = workoutdata['intervals']
intervals = sorted(intervals, key = lambda k:k['id'])
intervals = sorted(intervals, key=lambda k: k['id'])
separator = "|"
stri = "Workout Details\n"
stri += "#-{sep}SDist{sep}-Split-{sep}-SPace-{sep}-Pwr-{sep}-SPM--{sep}-AvgHR-{sep}DPS-\n".format(
@@ -143,10 +145,11 @@ def get_nk_intervalstats(workoutdata,strokedata):
avgpacetd = timedelta(seconds=avgpace)
newpacestring = strfdelta(avgpacetd)
elapsedSeconds = interval['elapsedTime']/1000. # secs
elapsedSeconds = interval['elapsedTime']/1000. # secs
elapsedTime = datetime.datetime.utcfromtimestamp(elapsedSeconds)
newsplitstring = "%s.%i" % (elapsedTime.strftime("%M:%S"), elapsedTime.microsecond/100000)
newsplitstring = "%s.%i" % (elapsedTime.strftime(
"%M:%S"), elapsedTime.microsecond/100000)
pwr = interval['avgPower']
avghr = interval['avgHeartRate']
@@ -160,30 +163,32 @@ def get_nk_intervalstats(workoutdata,strokedata):
space=newpacestring,
pwr=int(pwr),
sep=separator,
)
)
stri += " {spm} {sep} {avghr:0>3} {sep}{dps:0>4.1f}\n".format(
sep=separator,
avghr=avghr,
spm=spm,
dps=dps,
)
)
i += 1
return stri
def get_nk_summary(workoutdata,strokedata):
def get_nk_summary(workoutdata, strokedata):
name = workoutdata['name']
avgpace = workoutdata['avgPaceGps']/1000. # secs
avgpace = workoutdata['avgPaceGps']/1000. # secs
avgpacetd = timedelta(seconds=avgpace)
avgpacestring = strfdelta(avgpacetd)
elapsedSeconds = workoutdata['elapsedTime']/1000. # secs
elapsedSeconds = workoutdata['elapsedTime']/1000. # secs
elapsedTime = datetime.datetime.utcfromtimestamp(elapsedSeconds)
timestring = "%s.%i" % (elapsedTime.strftime("%H:%M:%S"), elapsedTime.microsecond/100000)
timestring = "%s.%i" % (elapsedTime.strftime(
"%H:%M:%S"), elapsedTime.microsecond/100000)
dist = workoutdata['totalDistanceGps']
spm = workoutdata['avgStrokeRate']
@@ -192,34 +197,31 @@ def get_nk_summary(workoutdata,strokedata):
maxhr = strokedata['heartRate'].max()
pwr = workoutdata['avgPower']
if dist is None: # pragma: no cover
if dist is None: # pragma: no cover
dist = 0
if spm is None: # pragma: no cover
if spm is None: # pragma: no cover
spm = 0
if avghr is None: # pragma: no cover
if avghr is None: # pragma: no cover
avghr = 0
if avgdps is None: # pragma: no cover
if avgdps is None: # pragma: no cover
avgdps = 0
if maxhr is None: # pragma: no cover
if maxhr is None: # pragma: no cover
maxhr = 0
if pwr is None: # pragma: no cover
if pwr is None: # pragma: no cover
pwr = 0
sep = "|"
stri1 = "Workout Summary - " + name + "\n"
stri1 += "--{sep}Total{sep}--Total---{sep}--Avg--{sep}-Avg-{sep}-Avg--{sep}-Avg-{sep}-Max-{sep}-Avg\n".format(
sep=sep)
sep=sep)
stri1 += "--{sep}Dist-{sep}--Time----{sep}-Pace--{sep}-Pwr-{sep}-SPM--{sep}-HR--{sep}-HR--{sep}-DPS\n".format(
sep=sep)
sep=sep)
stri1 += "--{sep}{dist:0>5.0f}{sep}".format(
sep=sep,
@@ -247,12 +249,15 @@ def get_nk_summary(workoutdata,strokedata):
return stri1
def get_nk_allstats(data,workoutdata):
def get_nk_allstats(data, workoutdata):
stri = get_nk_summary(data, workoutdata) + \
get_nk_intervalstats(data, workoutdata)
return stri
#def get_workout(user,nkid):
# def get_workout(user,nkid):
def getdict(x, seatIndex=1):
seatStrokes = pd.DataFrame(x)
try:
@@ -263,32 +268,32 @@ def getdict(x, seatIndex=1):
return {}
def strokeDataToDf(strokeData):
df = pd.DataFrame.from_dict(strokeData)
oarlockData = df['oarlockStrokes']
oarlockData = oarlockData.apply(lambda x:getdict(x, seatIndex=1))
oarlockData = oarlockData.apply(lambda x: getdict(x, seatIndex=1))
df2 = pd.DataFrame.from_records(oarlockData.values)
#df.set_index('timestamp',inplace=True)
# df.set_index('timestamp',inplace=True)
if not df2.empty:
#df2.set_index('timestamp',inplace=True)
df = df.merge(df2,left_index=True,right_index=True)
df = df.rename(columns={"timestamp_x":"timestamp"})
df = df.drop('oarlockStrokes',axis=1)
df.sort_values(by='timestamp',ascending=True,inplace=True)
df.fillna(inplace=True,method='ffill')
# df2.set_index('timestamp',inplace=True)
df = df.merge(df2, left_index=True, right_index=True)
df = df.rename(columns={"timestamp_x": "timestamp"})
df = df.drop('oarlockStrokes', axis=1)
df.sort_values(by='timestamp', ascending=True, inplace=True)
df.fillna(inplace=True, method='ffill')
return df
def readlogs_summaries(logfile,dosave=0): # pragma: no cover
with open(logfile,'r') as f:
def readlogs_summaries(logfile, dosave=0): # pragma: no cover
with open(logfile, 'r') as f:
while f:
s = f.readline()
if s == "":
@@ -296,7 +301,7 @@ def readlogs_summaries(logfile,dosave=0): # pragma: no cover
if "Importing" in s:
words = s.split(" ")
nkid = words[-1][0:6]
print(nkid,dosave)
print(nkid, dosave)
print('')
line1 = f.readline()
line2 = f.readline()
@@ -310,16 +315,16 @@ def readlogs_summaries(logfile,dosave=0): # pragma: no cover
df = strokeDataToDf(strokeData)
if dosave == 0 or str(nkid) == str(dosave):
print(get_nk_allstats(summaryData,df))
#print(summaryData)
print(get_nk_allstats(summaryData, df))
# print(summaryData)
if str(dosave) == str(nkid):
print('saving')
filename = 'strokedata_{id}.json'.format(id=nkid)
filename2 = 'nk_summarydata_{id}.json'.format(id=nkid)
with open(filename,'w') as f2:
json.dump(strokeData,f2)
with open(filename2,'w') as f2:
json.dump(summaryData,f2)
with open(filename, 'w') as f2:
json.dump(strokeData, f2)
with open(filename2, 'w') as f2:
json.dump(summaryData, f2)
except Exception as e:
print(traceback.format_exc())
print("error")