diff --git a/SpiceBot/SpiceBotCore/__init__.py b/SpiceBot/SpiceBotCore/__init__.py index 6a11790..fd01795 100644 --- a/SpiceBot/SpiceBotCore/__init__.py +++ b/SpiceBot/SpiceBotCore/__init__.py @@ -15,10 +15,10 @@ class SpiceBotCore_OBJ(): self.versions = None self.logger = None - def setup(self, script_dir, bot, logger): + def setup(self, script_dir, bot): self.script_dir = script_dir self.bot = bot self.config = Config(script_dir, bot) - self.logger = Logger(logger) + self.logger = Logger(self.config) self.versions = Versions(self.config, self.logger) diff --git a/SpiceBot/SpiceBotCore/config/__init__.py b/SpiceBot/SpiceBotCore/config/__init__.py index ecb6b33..2437740 100644 --- a/SpiceBot/SpiceBotCore/config/__init__.py +++ b/SpiceBot/SpiceBotCore/config/__init__.py @@ -15,3 +15,11 @@ class Config(): self.internal["paths"] = { "script_dir": self.script_dir } + + def __getattr__(self, name): + """ + Quick and dirty shortcuts. Will only get called for undefined attributes. + """ + + if hasattr(self.bot.config, name): + return eval("self.bot.config.%s" % name) diff --git a/SpiceBot/SpiceBotCore/logger/__init__.py b/SpiceBot/SpiceBotCore/logger/__init__.py index abee6a1..919fa6e 100644 --- a/SpiceBot/SpiceBotCore/logger/__init__.py +++ b/SpiceBot/SpiceBotCore/logger/__init__.py @@ -1,9 +1,11 @@ +from sopel import tools class Logger(): - def __init__(self, logger): - self.logger = logger + def __init__(self, config): + self.config = config + self.logger = tools.get_logger('SpiceBot') def __getattr__(self, name): """ diff --git a/SpiceBot/__init__.py b/SpiceBot/__init__.py index 0b629e1..b13f08b 100644 --- a/SpiceBot/__init__.py +++ b/SpiceBot/__init__.py @@ -7,7 +7,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi import os import pathlib -from sopel import plugin, logger +from sopel import plugin from .SpiceBotCore import SpiceBotCore_OBJ sbcore = SpiceBotCore_OBJ() @@ -16,7 +16,7 @@ SCRIPT_DIR = pathlib.Path(os.path.dirname(os.path.abspath(__file__))) def setup(bot): - sbcore.setup(SCRIPT_DIR, bot, logger) + sbcore.setup(SCRIPT_DIR, bot) @plugin.nickname_command('test')