|
Lines 66-72
Link Here
|
| 66 |
''' |
66 |
''' |
| 67 |
|
67 |
|
| 68 |
with open(os.path.join(configdir, "kernel-drivers.yaml")) as f: |
68 |
with open(os.path.join(configdir, "kernel-drivers.yaml")) as f: |
| 69 |
cf = yaml.load(f.read()) |
69 |
cf = yaml.safe_load(f.read()) |
| 70 |
drivers = cf['drivers'].copy() |
70 |
drivers = cf['drivers'].copy() |
| 71 |
for driver in cf['drivers']: |
71 |
for driver in cf['drivers']: |
| 72 |
if driver == 'default': |
72 |
if driver == 'default': |
|
Lines 132-145
Link Here
|
| 132 |
yamlpath = configdir |
132 |
yamlpath = configdir |
| 133 |
db = {} |
133 |
db = {} |
| 134 |
with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f: |
134 |
with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f: |
| 135 |
cf = yaml.load(f.read()) |
135 |
cf = yaml.safe_load(f.read()) |
| 136 |
db['lircd_by_driver'] = cf['lircd_by_driver'].copy() |
136 |
db['lircd_by_driver'] = cf['lircd_by_driver'].copy() |
| 137 |
db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy() |
137 |
db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy() |
| 138 |
|
138 |
|
| 139 |
db['kernel-drivers'] = _load_kerneldrivers(configdir) |
139 |
db['kernel-drivers'] = _load_kerneldrivers(configdir) |
| 140 |
db['drivers'] = db['kernel-drivers'].copy() |
140 |
db['drivers'] = db['kernel-drivers'].copy() |
| 141 |
with open(os.path.join(yamlpath, "drivers.yaml")) as f: |
141 |
with open(os.path.join(yamlpath, "drivers.yaml")) as f: |
| 142 |
cf = yaml.load(f.read()) |
142 |
cf = yaml.safe_load(f.read()) |
| 143 |
db['drivers'].update(cf['drivers'].copy()) |
143 |
db['drivers'].update(cf['drivers'].copy()) |
| 144 |
for key, d in db['drivers'].items(): |
144 |
for key, d in db['drivers'].items(): |
| 145 |
d['id'] = key |
145 |
d['id'] = key |
|
Lines 158-164
Link Here
|
| 158 |
configs = {} |
158 |
configs = {} |
| 159 |
for path in glob.glob(configdir + '/*.conf'): |
159 |
for path in glob.glob(configdir + '/*.conf'): |
| 160 |
with open(path) as f: |
160 |
with open(path) as f: |
| 161 |
cf = yaml.load(f.read()) |
161 |
cf = yaml.safe_load(f.read()) |
| 162 |
configs[cf['config']['id']] = cf['config'] |
162 |
configs[cf['config']['id']] = cf['config'] |
| 163 |
db['configs'] = configs |
163 |
db['configs'] = configs |
| 164 |
self.db = db |
164 |
self.db = db |
