use hierarchical property layers to make config changes effective

immediately
This commit is contained in:
Jakob Ketterl
2021-02-23 23:23:37 +01:00
parent 631232fe7c
commit dfaecdb357
9 changed files with 53 additions and 33 deletions

View File

@@ -1,6 +1,7 @@
from owrx.config.core import CoreConfig
from owrx.config.migration import Migrator
from owrx.property import PropertyLayer
from owrx.jsons import Encoder
import json
@@ -10,11 +11,24 @@ class DynamicConfig(PropertyLayer):
try:
with open(DynamicConfig._getSettingsFile(), "r") as f:
for k, v in json.load(f).items():
self[k] = v
if isinstance(v, dict):
self[k] = DynamicConfig._toLayer(v)
else:
self[k] = v
except FileNotFoundError:
pass
Migrator.migrate(self)
@staticmethod
def _toLayer(dictionary: dict):
layer = PropertyLayer()
for k, v in dictionary.items():
if isinstance(v, dict):
layer[k] = DynamicConfig._toLayer(v)
else:
layer[k] = v
return layer
@staticmethod
def _getSettingsFile():
coreConfig = CoreConfig()
@@ -22,6 +36,6 @@ class DynamicConfig(PropertyLayer):
def store(self):
# don't write directly to file to avoid corruption on exceptions
jsonContent = json.dumps(self.__dict__(), indent=4)
jsonContent = json.dumps(self.__dict__(), indent=4, cls=Encoder)
with open(DynamicConfig._getSettingsFile(), "w") as file:
file.write(jsonContent)