diff options
Diffstat (limited to 'src/pyssg/configuration.py')
| -rw-r--r-- | src/pyssg/configuration.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/pyssg/configuration.py b/src/pyssg/configuration.py index 3cc5430..e2dc26b 100644 --- a/src/pyssg/configuration.py +++ b/src/pyssg/configuration.py @@ -12,10 +12,11 @@ DEFAULT_CONFIG_PATH: str = '$XDG_CONFIG_HOME/pyssg/config.yaml' VERSION: str = version('pyssg') -def __check_well_formed_config(config: dict, - config_base: list[dict], +def __check_well_formed_config(config: dict[str, Any], + config_base: list[dict[str, Any]], prefix_key: str = '') -> None: for key in config_base[0].keys(): + new_config_base: list[dict[str, Any]] = [] current_key: str = f'{prefix_key}.{key}' if prefix_key != '' else key log.debug('checking "%s"', current_key) if key not in config: @@ -27,7 +28,7 @@ def __check_well_formed_config(config: dict, try: config[key].keys() except AttributeError: - log.error('config doesn\'t have any dirs configs (dirs.*)') + log.error('config doesn\'t have any dirs (dirs.*)') sys.exit(1) if '/' not in config[key]: log.debug('key: %s; config.keys: %s', key, config[key].keys()) @@ -37,7 +38,7 @@ def __check_well_formed_config(config: dict, key, ', '.join(config[key].keys())) for dkey in config[key].keys(): new_current_key: str = f'{current_key}.{dkey}' - new_config_base: list[dict] = [config_base[1], config_base[1]] + new_config_base = [config_base[1], config_base[1]] __check_well_formed_config(config[key][dkey], new_config_base, new_current_key) @@ -46,11 +47,11 @@ def __check_well_formed_config(config: dict, if not config_base[0][key]: log.debug('"%s" doesn\'t need nested elements', current_key) continue - new_config_base: list[dict] = [config_base[0][key], config_base[1]] + new_config_base = [config_base[0][key], config_base[1]] __check_well_formed_config(config[key], new_config_base, current_key) -def __expand_all_paths(config: dict) -> None: +def __expand_all_paths(config: dict[str, Any]) -> None: log.debug('expanding all path options: %s', config['path'].keys()) for option in config['path'].keys(): config['path'][option] = get_expanded_path(config['path'][option]) @@ -59,10 +60,11 @@ def __expand_all_paths(config: dict) -> None: # not necessary to type deeper than the first dict def get_parsed_config(path: str, mc_package: str = 'mandatory_config.yaml', - plt_resource: str = 'pyssg.plt') -> list[dict]: + plt_resource: str = 'pyssg.plt') -> list[dict[str, Any]]: log.debug('reading config file "%s"', path) - config_all: list[dict] = get_parsed_yaml(path) - mandatory_config: list[dict] = get_parsed_yaml(mc_package, plt_resource) + config_all: list[dict[str, Any]] = get_parsed_yaml(path) + mandatory_config: list[dict[str, Any]] = get_parsed_yaml(mc_package, + plt_resource) log.info('found %s document(s) for config "%s"', len(config_all), path) log.debug('checking that config file is well formed') for config in config_all: @@ -74,7 +76,7 @@ def get_parsed_config(path: str, # not necessary to type deeper than the first dict, # static config means config that shouldn't be changed by the user def get_static_config(sc_package: str = 'static_config.yaml', - plt_resource: str = 'pyssg.plt') -> dict[str, dict]: + plt_resource: str = 'pyssg.plt') -> dict[str, Any]: log.debug('reading and setting static config') config: dict[str, Any] = get_parsed_yaml(sc_package, plt_resource)[0] |