From: Zachary Vance Date: Sat, 10 Aug 2024 00:15:30 +0000 (-0400) Subject: Fix multiple config loading order X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=d345c30dcb8bc72d842411248054138e8637fda8;p=blog.git Fix multiple config loading order --- diff --git a/blog b/blog index 0c89d83..8c32483 100755 --- a/blog +++ b/blog @@ -330,13 +330,15 @@ class Blog(PseudoMap): self.now = datetime.datetime.now(datetime.timezone.utc) self.now_rfc822 = self.now.strftime(RFC822) - for config in configs: - self.load_config(os.path.abspath(config)) + self.load_configs([os.path.abspath(config) for config in configs]) self.load_posts() - def load_config(self, path): - with open(path) as f: - config = yaml.safe_load(f) + def load_configs(self, paths): + config = {} + for path in paths: + with open(path) as f: + for k, v in yaml.safe_load(f).items(): + config[k] = v for k in {"source", "destination"}: self[k] = os.path.expanduser(config.pop(k))