|
@@ -22,29 +22,28 @@ class SettingsLoader(object):
|
22
|
22
|
# @return dict()
|
23
|
23
|
#
|
24
|
24
|
def __merge(self):
|
25
|
|
- config = configparser.ConfigParser()
|
26
|
25
|
conf = dict()
|
27
|
26
|
dir_conf = os.open(self.__conf_path, os.O_RDONLY)
|
28
|
27
|
|
29
|
28
|
l = glob.glob(self.__conf_path+'/*.ini')
|
30
|
29
|
|
31
|
30
|
for f in l:
|
|
31
|
+ config = configparser.ConfigParser(default_section = 'lodel2')
|
32
|
32
|
config.read(f)
|
33
|
|
- for s in config:
|
34
|
|
- if s in conf:
|
35
|
|
- for vs in config[s]:
|
36
|
|
- if vs not in conf[s]:
|
37
|
|
- conf[s][vs] = config[s][vs]
|
38
|
|
- if s != 'DEFAULT': self.__conf_sv.add(s + ':' + vs)
|
39
|
|
- else:
|
40
|
|
- raise SettingsError("Key attribute already define : %s" % s + ' '+vs)
|
41
|
|
- else:
|
42
|
|
- opts={}
|
43
|
|
- for key in config[s]:
|
44
|
|
- opts[key] = config[s].get(key)
|
45
|
|
- if s != 'DEFAULT': self.__conf_sv.add(s + ':' + key)
|
46
|
|
- conf.update({s: opts})
|
47
|
|
- print(self.__conf_sv)
|
|
33
|
+ for s in config:
|
|
34
|
+ if s in conf:
|
|
35
|
+ for vs in config[s]:
|
|
36
|
+ if vs not in conf[s]:
|
|
37
|
+ conf[s][vs] = config[s][vs]
|
|
38
|
+ if s != 'DEFAULT': self.__conf_sv.add(s + ':' + vs)
|
|
39
|
+ else:
|
|
40
|
+ raise SettingsError("Key attribute already define : %s" % s + ' '+vs)
|
|
41
|
+ else:
|
|
42
|
+ opts={}
|
|
43
|
+ for key in config[s]:
|
|
44
|
+ opts[key] = config[s].get(key)
|
|
45
|
+ if s != 'DEFAULT': self.__conf_sv.add(s + ':' + key)
|
|
46
|
+ conf.update({s: opts})
|
48
|
47
|
os.close(dir_conf)
|
49
|
48
|
return conf
|
50
|
49
|
|