added default section to config load and save
This commit is contained in:
parent
e4231ce306
commit
4896d2e0c9
1 changed files with 35 additions and 12 deletions
|
@ -11,12 +11,30 @@ CONFFILE = 'pantalaimon.conf'
|
|||
def load():
|
||||
entries = []
|
||||
|
||||
loglevels = [ "warning", "info", "debug", "error" ]
|
||||
|
||||
defaults = {
|
||||
'name': "Default",
|
||||
'loglevel': "warning",
|
||||
'loglevel_idx': 0,
|
||||
'notifications': True
|
||||
}
|
||||
|
||||
if os.path.exists(CONFDIR + CONFFILE):
|
||||
config = configparser.ConfigParser()
|
||||
config.read_file(open(CONFDIR + CONFFILE))
|
||||
|
||||
for instance in config.sections():
|
||||
|
||||
item = {'name': instance}
|
||||
|
||||
if instance == "Default":
|
||||
item['loglevel'] = config[instance].get('loglevel', "warning")
|
||||
item['loglevel_idx'] = loglevels.index(config[instance].get('loglevel', 0))
|
||||
item['notifications'] = config[instance].getboolean('notifications', True)
|
||||
defaults = item
|
||||
|
||||
else:
|
||||
item['homeserver'] = config[instance].get('homeserver')
|
||||
item['listenaddress'] = config[instance].get('listenaddress')
|
||||
item['listenport'] = config[instance].get('listenport')
|
||||
|
@ -24,17 +42,21 @@ def load():
|
|||
item['ssl'] = config[instance].getboolean('ssl', True)
|
||||
item['ignoreverification'] = config[instance].getboolean('ignoreverification', True)
|
||||
item['usekeyring'] = config[instance].get('usekeyring')
|
||||
|
||||
entries.append(item)
|
||||
|
||||
return entries
|
||||
return (defaults, entries)
|
||||
|
||||
def save(data):
|
||||
def save(defaults, data):
|
||||
logging.debug("save config")
|
||||
dataobj = json.loads(data)
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
|
||||
defobj = json.loads(defaults)
|
||||
config['Default'] = {
|
||||
'loglevel': defobj['loglevel']
|
||||
}
|
||||
|
||||
for item in dataobj:
|
||||
if item['ssl']:
|
||||
sslval = 'true'
|
||||
|
@ -49,6 +71,7 @@ def save(data):
|
|||
config[item['name']]['ignoreverification'] = "true"
|
||||
config[item['name']]['usekeyring'] = "false"
|
||||
|
||||
if 'proxy' in item:
|
||||
if len(item['proxy']) > 0:
|
||||
config[item['name']]['proxy'] = item['proxy']
|
||||
|
||||
|
|
Loading…
Reference in a new issue