iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with optional parameters

Browse Source 
Optional config would not get parsed correctly, if you were noticing this issue, please use the web-ui to generate a new settings file.
Improved readability by using f-strings to parse module key values.
This commit is contained in:
Ace 2020-12-03 11:58:17 +01:00 committed by GitHub
parent 15eae0d4ee
commit 938746456c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/app/routes.py
View File

@ -72,7 +72,7 @@ def inkycal_config():
height = height-info_height height = height-info_height
# get all module heights, calculate single part # get all module heights, calculate single part
module_sizes = [int(request.form.get("module"+str(i)+"_height")) for i in range(1, no_of_modules+1)] module_sizes = [int(request.form.get(f"module{i}_height")) for i in range(1, no_of_modules+1)]
if sum(module_sizes) != 0: if sum(module_sizes) != 0:
single_part = height / sum(module_sizes) single_part = height / sum(module_sizes)
@ -87,7 +87,7 @@ def inkycal_config():
for modules in settings: for modules in settings:
if modules['name'] == request.form.get(module): if modules['name'] == request.form.get(module):
module_height = int( request.form.get("module"+str(i)+"_height") ) module_height = int( request.form.get(f"module{i}_height") )
conf['config']['size'] = (width, int(single_part*module_height) ) conf['config']['size'] = (width, int(single_part*module_height) )
# Add required fields to the config of the module in question # Add required fields to the config of the module in question
@ -95,7 +95,7 @@ def inkycal_config():
# Convert "True" to True, "False" to False and empty input to None # Convert "True" to True, "False" to False and empty input to None
if 'requires' in modules: if 'requires' in modules:
for key in modules['requires']: for key in modules['requires']:
val = request.form.get('module'+str(i)+'_'+key).replace(" ", "") val = request.form.get(f'module{i}_{key}').replace(" ", "")
if val == "True": if val == "True":
val = True val = True
elif val == "False": elif val == "False":
@ -110,8 +110,8 @@ def inkycal_config():
# Convert "True" to True, "False" to False and empty input to None # Convert "True" to True, "False" to False and empty input to None
if 'optional' in modules: if 'optional' in modules:
for key in modules['optional']: for key in modules['optional']:
if request.form.get(module+'_'+key): if request.form.get(f'module{i}_{key}'):
val = request.form.get('module'+str(i)+'_'+key).replace(" ", "") val = request.form.get(f'module{i}_{key}').replace(" ", "")
if val == "True": if val == "True":
val = True val = True
elif val == "False": elif val == "False":