Add subfeed configs

This commit is contained in:
Tim Van Baak 2020-12-28 17:07:34 -08:00
parent e0f4eec15a
commit 9843fd93c4
2 changed files with 39 additions and 9 deletions

View File

@ -19,6 +19,15 @@ def command_test(args):
CONFIG_CACHE, cache_path,
CONFIG_LOGFILE, log_file,
CONFIG_VERBOSE, is_verbose,
CONFIG_SUBFEEDS, subfeeds,
)
subfeeds = '; '.join(
'{0}: {1}'.format(
sf_name,
' '.join(sf_sources)
)
for sf_name, sf_sources
in subfeeds.items()
)
print(f'Inquisitor configured from {config_path}')
print(f' {CONFIG_DATA} = {data_path}')
@ -26,6 +35,7 @@ def command_test(args):
print(f' {CONFIG_CACHE} = {cache_path}')
print(f' {CONFIG_LOGFILE} = {log_file}')
print(f' {CONFIG_VERBOSE} = {is_verbose}')
print(f' {CONFIG_SUBFEEDS} = {subfeeds}')
return 0

View File

@ -27,6 +27,11 @@ DEFAULT_LOG_FILE = None
CONFIG_VERBOSE = 'Verbose'
DEFAULT_VERBOSITY = 'false'
# Subfeed source lists, with each subfeed config separated by lines and
# sources within a subfeed separated by spaces
CONFIG_SUBFEEDS = 'Subfeeds'
DEFAULT_SUBFEEDS = None
def read_config_file(config_path):
"""
@ -38,21 +43,26 @@ def read_config_file(config_path):
if not os.path.isfile(config_path):
raise FileNotFoundError(f'No config file found at {config_path}')
accumulated_configs = {}
current_key = None
with open(config_path, 'r', encoding='utf8') as cfg:
line_no = 0
for line in cfg:
line_no += 1
# Skip blank lines
if not line.strip():
continue
# Skip comments
if line.lstrip().startswith('#'):
# Skip blank lines and comments
if not line.strip() or line.lstrip().startswith('#'):
continue
# Accumulate config keyvalue pairs
if '=' not in line:
if '=' in line:
# "key = value" begins a new keyvalue pair
current_key, value = line.split('=', maxsplit=1)
current_key = current_key.strip()
accumulated_configs[current_key] = value.strip()
else:
# If there's no '=' and no previous key, throw
if not current_key:
raise ValueError(f'Invalid config format on line {line_no}')
key, value = line.split('=', maxsplit=1)
accumulated_configs[key.strip()] = value.strip()
else:
accumulated_configs[current_key] += '\n' + line.strip()
return accumulated_configs
@ -93,6 +103,16 @@ if is_verbose != 'true' and is_verbose != 'false':
raise ValueError(f'Invalid verbose value (must be "true" or "false"): {is_verbose}')
is_verbose = (is_verbose == 'true')
subfeeds = configs.get(CONFIG_SUBFEEDS) or DEFAULT_SUBFEEDS
if subfeeds:
sf_defs = [sf.strip() for sf in subfeeds.split('\n') if sf.strip()]
subfeeds = {}
for sf_def in sf_defs:
if ':' not in sf_def:
raise ValueError(f'Invalid subfeed definition: {sf_def}')
sf_name, sf_sources = sf_def.split(':', maxsplit=1)
sf_sources = sf_sources.split()
subfeeds[sf_name.strip()] = [source.strip() for source in sf_sources]
# Set up logging
logger = logging.getLogger("inquisitor")