X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7e70e5f50310b7bdf79e39b4a5a4964f9a6d051b..a6dab5e300de9c5664f714eb2c9290d18f01067f:/nominatim/config.py diff --git a/nominatim/config.py b/nominatim/config.py index a3f91055..b3934b49 100644 --- a/nominatim/config.py +++ b/nominatim/config.py @@ -86,26 +86,37 @@ class Configuration: Values of '1', 'yes' and 'true' are accepted as truthy values, everything else is interpreted as false. """ - return self.__getattr__(name).lower() in ('1', 'yes', 'true') + return getattr(self, name).lower() in ('1', 'yes', 'true') def get_int(self, name): """ Return the given configuration parameter as an int. """ try: - return int(self.__getattr__(name)) + return int(getattr(self, name)) except ValueError as exp: LOG.fatal("Invalid setting NOMINATIM_%s. Needs to be a number.", name) raise UsageError("Configuration error.") from exp + def get_str_list(self, name): + """ Return the given configuration parameter as a list of strings. + The values are assumed to be given as a comma-sparated list and + will be stripped before returning them. On empty values None + is returned. + """ + raw = getattr(self, name) + + return [v.strip() for v in raw.split(',')] if raw else None + + def get_path(self, name): """ Return the given configuration parameter as a Path. If a relative path is configured, then the function converts this into an absolute path with the project directory as root path. If the configuration is unset, a falsy value is returned. """ - value = self.__getattr__(name) + value = getattr(self, name) if value: value = Path(value) @@ -141,10 +152,10 @@ class Configuration: name of the standard styles automatically into a file in the config style. """ - style = self.__getattr__('IMPORT_STYLE') + style = getattr(self, 'IMPORT_STYLE') if style in ('admin', 'street', 'address', 'full', 'extratags'): - return self.config_dir / 'import-{}.style'.format(style) + return self.config_dir / f'import-{style}.style' return self.find_config_file('', 'IMPORT_STYLE') @@ -203,7 +214,7 @@ class Configuration: a regular file. """ if config is not None: - cfg_filename = self.__getattr__(config) + cfg_filename = getattr(self, config) if cfg_filename: cfg_filename = Path(cfg_filename)