From 87c633aa0e85ba293f087f426ed01bdf46452096 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 9 Feb 2022 15:41:48 -0500 Subject: [PATCH] test --- SpiceBot/SpiceBotCore/__init__.py | 9 ++++----- SpiceBot/SpiceBotCore/config/__init__.py | 3 +-- SpiceBot/SpiceBotCore/versions/__init__.py | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/SpiceBot/SpiceBotCore/__init__.py b/SpiceBot/SpiceBotCore/__init__.py index 548b3cb..176e43b 100644 --- a/SpiceBot/SpiceBotCore/__init__.py +++ b/SpiceBot/SpiceBotCore/__init__.py @@ -14,9 +14,8 @@ class SpiceBotCore_OBJ(): # Allow SpiceBot to interact with Sopel Logger self.logger = Logger() - # Parse Version Information for the ENV - self.versions = Versions(self.logger) + # Allow Spicebot to mimic Sopel Config + self.config = Config(script_dir) - # def setup(self, script_dir, bot): - # self.bot = bot - # self.config = Config(script_dir, bot) + # Parse Version Information for the ENV + self.versions = Versions(self.config, self.logger) diff --git a/SpiceBot/SpiceBotCore/config/__init__.py b/SpiceBot/SpiceBotCore/config/__init__.py index 9de6d53..81dffbe 100644 --- a/SpiceBot/SpiceBotCore/config/__init__.py +++ b/SpiceBot/SpiceBotCore/config/__init__.py @@ -9,9 +9,8 @@ from sopel.cli.run import build_parser, get_configuration class Config(): - def __init__(self, script_dir, bot): + def __init__(self, script_dir): self.script_dir = script_dir - self.bot = bot self.internal = {} diff --git a/SpiceBot/SpiceBotCore/versions/__init__.py b/SpiceBot/SpiceBotCore/versions/__init__.py index 1465d01..25d079e 100644 --- a/SpiceBot/SpiceBotCore/versions/__init__.py +++ b/SpiceBot/SpiceBotCore/versions/__init__.py @@ -8,7 +8,8 @@ import re class Versions(): - def __init__(self, logger): + def __init__(self, config, logger): + self.config = config self.logger = logger self.dict = {} @@ -41,7 +42,7 @@ class Versions(): Register core version items. """ - version_file = pathlib.Path(self.script_dir).joinpath("version.json") + version_file = pathlib.Path(self.config.script_dir).joinpath("version.json") with open(version_file, 'r') as jsonversion: versions = json.load(jsonversion)