From b1f96a494df310e232e389e283a2a4c3b1b660f8 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 23 Feb 2022 15:04:38 -0500 Subject: [PATCH] test --- sopel_SpiceBot_Core_Prerun/__init__.py | 26 +++++++++++++++++++++--- sopel_SpiceBot_Core_Prerun/comrun.py | 8 -------- sopel_SpiceBot_Core_Prerun/pipe_split.py | 15 -------------- 3 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 sopel_SpiceBot_Core_Prerun/comrun.py delete mode 100644 sopel_SpiceBot_Core_Prerun/pipe_split.py diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index 93c6cc0..b83194e 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -2,9 +2,6 @@ import functools from sopel_SpiceBot_Core_1 import sb -from .comrun import ComRun -from .pipe_split import rebuild_pipes - def prerun(rulematch=False): """This decorator is the hub of handling for all SpiceBot Commands""" @@ -66,3 +63,26 @@ def prerun(rulematch=False): return internal_prerun return actual_decorator + + +def rebuild_pipes(commands): + + repipe_trigger_dict = commands[0] + + for trigger_dict in commands[1:]: + if trigger_dict["trigger_type"] == "command": + repipe_trigger_dict["trigger_str"] += " | %s%s %s" % (trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) + elif trigger_dict["trigger_type"] == "nickname_command": + repipe_trigger_dict["trigger_str"] += " | %s %s %s" % (trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) + elif trigger_dict["trigger_type"] == "action_command": + repipe_trigger_dict["trigger_str"] += " | %s %s %s" % ("/me", trigger_dict["trigger_command"], trigger_dict["trigger_str"]) + + return repipe_trigger_dict + + +class ComRun(): + + def __init__(self, rulematch, trigger): + self.rulematch = rulematch + self.original_trigger = trigger + self.trigger_dict = {} diff --git a/sopel_SpiceBot_Core_Prerun/comrun.py b/sopel_SpiceBot_Core_Prerun/comrun.py deleted file mode 100644 index 289d5ff..0000000 --- a/sopel_SpiceBot_Core_Prerun/comrun.py +++ /dev/null @@ -1,8 +0,0 @@ - - -class ComRun(): - - def __init__(self, rulematch, trigger): - self.rulematch = rulematch - self.original_trigger = trigger - self.trigger_dict = {} diff --git a/sopel_SpiceBot_Core_Prerun/pipe_split.py b/sopel_SpiceBot_Core_Prerun/pipe_split.py deleted file mode 100644 index 1e9d82e..0000000 --- a/sopel_SpiceBot_Core_Prerun/pipe_split.py +++ /dev/null @@ -1,15 +0,0 @@ - - -def rebuild_pipes(commands): - - repipe_trigger_dict = commands[0] - - for trigger_dict in commands[1:]: - if trigger_dict["trigger_type"] == "command": - repipe_trigger_dict["trigger_str"] += " | %s%s %s" % (trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) - elif trigger_dict["trigger_type"] == "nickname_command": - repipe_trigger_dict["trigger_str"] += " | %s %s %s" % (trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) - elif trigger_dict["trigger_type"] == "action_command": - repipe_trigger_dict["trigger_str"] += " | %s %s %s" % ("/me", trigger_dict["trigger_command"], trigger_dict["trigger_str"]) - - return repipe_trigger_dict