yannic/stacosys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use configparser and remove profig lib

Browse source
This commit is contained in:
Yax 2022-11-12 12:51:25 +01:00
parent 4403ade053
commit 0741bd182e
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
stacosys/conf/config.py
View file

@ -3,7 +3,7 @@
from enum import Enum from enum import Enum
import profig import configparser
class ConfigParameter(Enum): class ConfigParameter(Enum):
@ -32,32 +32,51 @@ class ConfigParameter(Enum):
class Config: class Config:
def __init__(self): def __init__(self):
self._params = dict() self._cfg = configparser.ConfigParser()
@classmethod @classmethod
def load(cls, config_pathname): def load(cls, config_pathname):
cfg = profig.Config(config_pathname)
cfg.sync()
config = cls() config = cls()
config._params.update(cfg) config._cfg.read(config_pathname)
return config return config
def _split_key(self, key: ConfigParameter):
section, param = str(key.value).split(".")
if not param:
param = section
section = None
return (section, param)
def exists(self, key: ConfigParameter): def exists(self, key: ConfigParameter):
return key.value in self._params section, param = self._split_key(key)
return self._cfg.has_option(section, param)
def get(self, key: ConfigParameter): def get(self, key: ConfigParameter):
return self._params[key.value] if key.value in self._params else None section, param = self._split_key(key)
return (
self._cfg.get(section, param)
if self._cfg.has_option(section, param)
else None
)
def put(self, key: ConfigParameter, value): def put(self, key: ConfigParameter, value):
self._params[key.value] = value section, param = self._split_key(key)
if section and not self._cfg.has_section(section):
self._cfg.add_section(section)
self._cfg.set(section, param, str(value))
def get_int(self, key: ConfigParameter): def get_int(self, key: ConfigParameter):
return int(self._params[key.value]) value = self.get(key)
return int(value) if value else 0
def get_bool(self, key: ConfigParameter): def get_bool(self, key: ConfigParameter):
value = self._params[key.value].lower() value = self.get(key)
assert value in ("yes", "true", "no", "false") assert value in ("yes", "true", "no", "false")
return value in ("yes", "true") return value in ("yes", "true")
def __repr__(self): def __repr__(self):
return self._params.__repr__() d = dict()
for section in self._cfg.sections():
for option in self._cfg.options(section):
d[".".join([section, option])] = self._cfg.get(section, option)
return str(d)

5
tests/test_config.py
View file

@ -23,9 +23,10 @@ class ConfigTestCase(unittest.TestCase):
self.assertEqual( self.assertEqual(
self.conf.get(ConfigParameter.DB_SQLITE_FILE), EXPECTED_DB_SQLITE_FILE self.conf.get(ConfigParameter.DB_SQLITE_FILE), EXPECTED_DB_SQLITE_FILE
) )
self.assertEqual(self.conf.get(ConfigParameter.HTTP_PORT), EXPECTED_HTTP_PORT)
self.assertIsNone(self.conf.get(ConfigParameter.HTTP_HOST)) self.assertIsNone(self.conf.get(ConfigParameter.HTTP_HOST))
self.assertEqual(self.conf.get(ConfigParameter.HTTP_PORT), EXPECTED_HTTP_PORT) self.assertEqual(
self.conf.get(ConfigParameter.HTTP_PORT), str(EXPECTED_HTTP_PORT)
)
self.assertEqual(self.conf.get_int(ConfigParameter.HTTP_PORT), 8080) self.assertEqual(self.conf.get_int(ConfigParameter.HTTP_PORT), 8080)
try: try:
self.conf.get_bool(ConfigParameter.DB_SQLITE_FILE) self.conf.get_bool(ConfigParameter.DB_SQLITE_FILE)