diff --git a/SpiceBot/SpiceBotCore/__init__.py b/SpiceBot/SpiceBotCore/__init__.py index 304556b..6a11790 100644 --- a/SpiceBot/SpiceBotCore/__init__.py +++ b/SpiceBot/SpiceBotCore/__init__.py @@ -1,6 +1,7 @@ from .config import Config from .versions import Versions +from .logger import Logger class SpiceBotCore_OBJ(): @@ -12,10 +13,12 @@ class SpiceBotCore_OBJ(): self.config = None self.versions = None + self.logger = None - def setup(self, script_dir, bot): + def setup(self, script_dir, bot, logger): self.script_dir = script_dir self.bot = bot self.config = Config(script_dir, bot) - self.versions = Versions(self.config) + self.logger = Logger(logger) + self.versions = Versions(self.config, self.logger) diff --git a/SpiceBot/SpiceBotCore/config/__init__.py b/SpiceBot/SpiceBotCore/config/__init__.py index 0d21b3f..ecb6b33 100644 --- a/SpiceBot/SpiceBotCore/config/__init__.py +++ b/SpiceBot/SpiceBotCore/config/__init__.py @@ -8,6 +8,8 @@ class Config(): self.internal = {} + self.core_setup() + def core_setup(self): self.internal["paths"] = { diff --git a/SpiceBot/SpiceBotCore/logger/__init__.py b/SpiceBot/SpiceBotCore/logger/__init__.py new file mode 100644 index 0000000..abee6a1 --- /dev/null +++ b/SpiceBot/SpiceBotCore/logger/__init__.py @@ -0,0 +1,17 @@ + + +class Logger(): + + def __init__(self, logger): + self.logger = logger + + def __getattr__(self, name): + """ + Quick and dirty shortcuts. Will only get called for undefined attributes. + """ + + if hasattr(self.logger, name): + return eval("self.logger.%s" % name) + + elif hasattr(self.logger, name.lower()): + return eval("self.logger.%s" % name.lower()) diff --git a/SpiceBot/SpiceBotCore/versions/__init__.py b/SpiceBot/SpiceBotCore/versions/__init__.py index 063e29a..d849188 100644 --- a/SpiceBot/SpiceBotCore/versions/__init__.py +++ b/SpiceBot/SpiceBotCore/versions/__init__.py @@ -8,8 +8,9 @@ import re class Versions(): - def __init__(self, config): + def __init__(self, config, logger): self.config = config + self.logger = logger self.dict = {} diff --git a/SpiceBot/__init__.py b/SpiceBot/__init__.py index b13f08b..0b629e1 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 +from sopel import plugin, logger 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) + sbcore.setup(SCRIPT_DIR, bot, logger) @plugin.nickname_command('test')