From a10aca7f4ac3fccf2c06b49eeff71f7a1f9effce Mon Sep 17 00:00:00 2001 From: Andrei Date: Thu, 26 Jan 2017 02:33:22 -0800 Subject: [PATCH] Allow overriding plugin configuration in the top-level bot config --- disco/bot/bot.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/disco/bot/bot.py b/disco/bot/bot.py index d1a31f6..7a8a433 100644 --- a/disco/bot/bot.py +++ b/disco/bot/bot.py @@ -65,6 +65,7 @@ class BotConfig(Config): The directory plugin configuration is located within. """ levels = {} + plugin_config = {} commands_enabled = True commands_require_mention = True @@ -455,17 +456,18 @@ class Bot(LoggingClass): path = os.path.join( self.config.plugin_config_dir, name) + '.' + self.config.plugin_config_format - if not os.path.exists(path): - if hasattr(cls, 'config_cls'): - return cls.config_cls() - return + data = {} + if name in self.config.plugin_config: + data = self.config.plugin_config[name] - with open(path, 'r') as f: - data = Serializer.loads(self.config.plugin_config_format, f.read()) + if os.path.exists(path): + with open(path, 'r') as f: + data.update(Serializer.loads(self.config.plugin_config_format, f.read())) if hasattr(cls, 'config_cls'): inst = cls.config_cls() - inst.update(data) + if data: + inst.update(data) return inst return data