0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

also populate lists with defaults in config

Browse source
This commit is contained in:
j 2013-08-16 12:44:58 +00:00
parent d5da33feb7
commit 9a288e8893
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pandora/app/config.py
View file

@ -68,7 +68,8 @@ def load_config():
#add missing defaults #add missing defaults
for section in ( for section in (
'capabilities', 'cantPlay', 'itemName', 'media', 'posters', 'capabilities', 'cantPlay', 'itemName', 'media', 'posters',
'site', 'tv', 'user.ui', 'user.ui.part', 'user.ui.showFolder' 'site', 'tv', 'user.ui', 'user.ui.part', 'user.ui.showFolder',
'menuExtras'
): ):
parts = map(lambda p: p.replace('\0', '\\.'), section.replace('\\.', '\0').split('.')) parts = map(lambda p: p.replace('\0', '\\.'), section.replace('\\.', '\0').split('.'))
#print 'checking', section #print 'checking', section
@ -76,15 +77,24 @@ def load_config():
d = default d = default
while len(parts): while len(parts):
part = parts.pop(0) part = parts.pop(0)
if part not in c:
c[part] = {}
c = c[part]
d = d[part] d = d[part]
for key in d: if part not in c:
if key not in c: if isinstance(d, list):
sys.stderr.write("adding default value for %s.%s = %s\n" % ( c[part] = []
section, key, str(d[key]))) else:
c[key] = d[key] c[part] = {}
c = c[part]
if isinstance(d, list):
if not c:
c += d
sys.stderr.write("adding default value for %s = %s\n" % (
section, str(d)))
else:
for key in d:
if key not in c:
sys.stderr.write("adding default value for %s.%s = %s\n" % (
section, key, str(d[key])))
c[key] = d[key]
key = get_by_id(config['itemKeys'], 'title') key = get_by_id(config['itemKeys'], 'title')
if not 'autocompleteSort' in key: if not 'autocompleteSort' in key: