storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make ,..# vaid section#option separators

Browse Source
This commit is contained in:
Chrys 2019-08-24 19:27:24 +02:00
parent 0e8ebc43b4
commit d380ab711d
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/fenrirscreenreader/core/settingsManager.py
View File

@ -240,18 +240,32 @@ class settingsManager():
#self.env['runtime']['debug'].writeDebugOut('settingsManager:setOptionArgDict:Datatype missmatch: '+ section + '#' + setting + '=' + value + ' Error:' + str(e), debug.debugLevel.ERROR) #self.env['runtime']['debug'].writeDebugOut('settingsManager:setOptionArgDict:Datatype missmatch: '+ section + '#' + setting + '=' + value + ' Error:' + str(e), debug.debugLevel.ERROR)
return return
def parseSettingArgs(self, settingArgs): def parseSettingArgs(self, settingArgs):
for optionElem in settingArgs.split(';'): for optionElem in settingArgs.split(';'):
if len(optionElem.split('#',1)) != 2: settingValList = []
sectionOptionList = []
section = ''
option = ''
value = ''
settingValList = optionElem.split('=',1)
if len(settingValList) != 2:
continue continue
if len(optionElem.split('#',1)[1].split('=',1)) != 2: if '#' in settingValList[0]:
sectionOptionList = settingValList[0].split('#', 1)
elif '.' in settingValList[0]:
sectionOptionList = settingValList[0].split('.', 1)
elif ',' in settingValList[0]:
sectionOptionList = settingValList[0].split(',', 1)
elif '!' in settingValList[0]:
sectionOptionList = settingValList[0].split('!', 1)
else:
continue
if len(sectionOptionList) != 2:
continue continue
section = str(optionElem.split('#',1)[0]) section = str(sectionOptionList[0])
option = str(optionElem.split('#',1)[1].split('=',1)[0]) option = str(sectionOptionList[1])
value = optionElem.split('#',1)[1].split('=',1)[1] value = str(settingValList[1])
self.setOptionArgDict(section, option, value) self.setOptionArgDict(section, option, value)
def initFenrirConfig(self, cliArgs, fenrirManager = None, environment = environment.environment): def initFenrirConfig(self, cliArgs, fenrirManager = None, environment = environment.environment):