From df4307c4ff291c342c0fcd91b9b0587731dcfa7e Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 25 Apr 2019 19:00:25 -0400 Subject: [PATCH] move config loading into function for easier runtime reloading --- archivebox/cli/archivebox_list.py | 2 ++ archivebox/legacy/config.py | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/archivebox/cli/archivebox_list.py b/archivebox/cli/archivebox_list.py index 91b740d7..416fa3d7 100644 --- a/archivebox/cli/archivebox_list.py +++ b/archivebox/cli/archivebox_list.py @@ -112,6 +112,8 @@ def main(args=None): if command.sort: links = sorted(links, key=lambda link: getattr(link, command.sort)) + links = list(links) + if command.status == 'indexed': folders = get_indexed_folders(links, out_dir=OUTPUT_DIR) elif command.status == 'archived': diff --git a/archivebox/legacy/config.py b/archivebox/legacy/config.py index 9cf92c1c..dfeacc22 100644 --- a/archivebox/legacy/config.py +++ b/archivebox/legacy/config.py @@ -500,16 +500,18 @@ def get_chrome_info(config: ConfigDict) -> ConfigValue: ################################## Load Config ################################# -CONFIG: ConfigDict -CONFIG = load_config(SHELL_CONFIG_DEFAULTS) -CONFIG = load_config(ARCHIVE_CONFIG_DEFAULTS, CONFIG) -CONFIG = load_config(ARCHIVE_METHOD_TOGGLES_DEFAULTS, CONFIG) -CONFIG = load_config(ARCHIVE_METHOD_OPTIONS_DEFAULTS, CONFIG) -CONFIG = load_config(DEPENDENCY_CONFIG_DEFAULTS, CONFIG) -CONFIG = load_config(DERIVED_CONFIG_DEFAULTS, CONFIG) +def load_all_config(): + CONFIG: ConfigDict = {} + for section_name, section_config in CONFIG_DEFAULTS.items(): + CONFIG = load_config(section_config, CONFIG) + + return load_config(DERIVED_CONFIG_DEFAULTS, CONFIG) + +CONFIG = load_all_config() globals().update(CONFIG) + ############################## Importable Checkers ############################# def check_system_config(config: ConfigDict=CONFIG) -> None: