joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to json to avoid external dependency

Browse Source
This commit is contained in:
Jakob Ketterl 2020-03-29 17:14:37 +02:00
parent f81e53e455
commit 2b7d6738f1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
owrx/config.py
View File

@ -2,7 +2,7 @@ from owrx.property import PropertyManager, PropertyLayer
import importlib.util
import os
import logging
import yaml
import json
logger = logging.getLogger(__name__)
@ -36,21 +36,21 @@ class Config:
return pm
@staticmethod
def _loadYamlFile(file):
def _loadJsonFile(file):
with open(file, "r") as f:
pm = PropertyLayer()
for k, v in yaml.load(f).items():
for k, v in json.load(f).items():
pm[k] = v
return pm
@staticmethod
def _loadConfig():
for file in ["settings.yaml", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
for file in ["settings.json", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
try:
if file.endswith(".py"):
return Config._loadPythonFile(file)
elif file.endswith(".yaml"):
return Config._loadYamlFile(file)
elif file.endswith(".json"):
return Config._loadJsonFile(file)
else:
logger.warning("unsupported file type: %s", file)
except FileNotFoundError:
@ -65,8 +65,8 @@ class Config:
@staticmethod
def store():
with open("settings.yaml", "w") as file:
yaml.dump(Config.get().__dict__(), file)
with open("settings.json", "w") as file:
json.dump(Config.get().__dict__(), file, indent=4)
@staticmethod
def validateConfig():