Skip to content

Update nested parameters feature #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2023
+20 −20
Merged

Update nested parameters feature #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions JsonPreprocessor/CJsonPreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import re
import sys
import platform
import copy

class CSyntaxType():
python = "python"
Expand Down Expand Up @@ -413,36 +414,35 @@ def __updateAndReplaceNestedParam(self, oJson : dict, recursive : bool = False):
Output Json object as dictionary with all variables resolved.
'''

def __tmpJsonUpdated(k, v, tmpJson, bNested):
if bNested:
if '[' in k:
sExec = k + " = \"" + v + "\"" if isinstance(v, str) else k + " = " + str(v)
try:
exec(sExec, globals())
except:
raise Exception(f"Could not set variable '{k}' with value '{v}'!")
else:
tmpJson[k] = v
def __jsonUpdated(k, v, oJson):
if '[' in k:
sExec = k + " = \"" + v + "\"" if isinstance(v, str) else k + " = " + str(v)
try:
exec(sExec, globals())
except:
raise Exception(f"Could not set variable '{k}' with value '{v}'!")
else:
tmpJson[k] = v
oJson[k] = v


if bool(self.currentCfg) and not recursive:
for k, v in self.currentCfg.items():
globals().update({k:v})

tmpJson = {}
for k, v in oJson.items():
tmpJson = copy.deepcopy(oJson)
for k, v in tmpJson.items():
bNested = False
if re.match('.*\${\s*', k.lower()):
if re.match("str\(\s*\${.+", k.lower()):
k = re.sub("str\(\s*(\${.+)\s*\)", "\\1", k)
keyAfterProcessed = self.__nestedParamHandler(k)
k = re.sub('^\s*\${\s*(.*?)\s*}', '\\1', keyAfterProcessed)
self.lUpdatedParams.append(k)
bNested = True

if isinstance(v, dict):
v = self.__updateAndReplaceNestedParam(v, recursive=True)
__tmpJsonUpdated(k, v, tmpJson, bNested)
__jsonUpdated(k, v, tmpJson)
bNested = False

elif isinstance(v, list):
Expand Down Expand Up @@ -472,7 +472,7 @@ def __tmpJsonUpdated(k, v, tmpJson, bNested):
raise Exception(f"The variable '{tmpItemAfterProcessed}' is not available!")

tmpValue.append(item)
__tmpJsonUpdated(k, tmpValue, tmpJson, bNested)
__jsonUpdated(k, v, oJson)
bNested = False

elif isinstance(v, str):
Expand Down Expand Up @@ -502,15 +502,15 @@ def __tmpJsonUpdated(k, v, tmpJson, bNested):
if isinstance(v, str) and re.match('^\s*none|true|false\s*$', v.lower()):
v = '\"' + v + '\"'

__tmpJsonUpdated(k, v, tmpJson, bNested)
__jsonUpdated(k, v, oJson)
bNested = False
else:
__tmpJsonUpdated(k, v, tmpJson, bNested)
__jsonUpdated(k, v, oJson)
bNested = False
else:
__tmpJsonUpdated(k, v, tmpJson, bNested)

oJson.update(tmpJson)
if bNested:
__jsonUpdated(k, v, oJson)
bNested = False
return oJson

def __checkAndUpdateKeyValue(self, sInputStr: str) -> str:
Expand Down