Private
Public Access
1
0

passing test for user

This commit is contained in:
Sander Roosendaal
2019-01-24 16:53:45 +01:00
parent 0f3f9c1b2b
commit 73fe1ddf8f
4 changed files with 45 additions and 7 deletions

View File

@@ -82,6 +82,16 @@ def matchchart(line):
if tester3.match(line.lower()):
return 'pieplot'
def matchuser(line):
testert = '^(user)'
tester = re.compile(testert)
if tester.match(line.lower()):
words = line.split()
return words[1]
return None
def matchsync(line):
results = []
tester = '((sync)|(synchronization)|(export))'
@@ -176,6 +186,14 @@ def getplotoptions_body2(uploadoptions,body):
return uploadoptions
def getuseroptions_body2(uploadoptions,body):
for line in body.splitlines():
user = matchuser(line)
if user:
uploadoptions['username'] = user
return uploadoptions
def getsyncoptions_body2(uploadoptions,body):
result = []
for line in body.splitlines():
@@ -261,6 +279,11 @@ def getboattype(uploadoptions,value,key):
return uploadoptions
def getuser(uploadoptions,value,key):
uploadoptions['username'] = value
return uploadoptions
def getsource(uploadoptions,value,key):
workoutsource = 'unknown'
for type,verb in workoutsources:
@@ -306,6 +329,8 @@ def upload_options(body):
uploadoptions = getboattype(uploadoptions,value,'boattype')
if 'source' in lowkey:
uploadoptions = getsource(uploadoptions,value,'workoutsource')
if 'username' in lowkey:
uploadoptions = getuser(uploadoptions,value,'workoutuser')
except AttributeError:
#pass
raise yaml.YAMLError
@@ -317,6 +342,7 @@ def upload_options(body):
uploadoptions = gettypeoptions_body2(uploadoptions,body)
uploadoptions = getstravaid(uploadoptions,body)
uploadoptions = getworkoutsources(uploadoptions,body)
uploadoptions = getuseroptions_body2(uploadoptions,body)
except IOError:
pm = exc.problem_mark
strpm = str(pm)