deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-12 22:49:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

seperate hyphen arg logic

Browse Source
This commit is contained in:
deathbybandaid 2019-05-23 19:28:16 -04:00
parent 2174cf5732
commit f42fc29506
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sopel_modules/SpiceBot/Prerun.py
View File

@ -20,6 +20,18 @@ class BotPrerun():
def __init__(self): def __init__(self):
self.dict = {} self.dict = {}
def hyphenargs(self, trigger_command_type='module'):
def actual_decorator(function):
@functools.wraps(function)
def internal_prerun(bot, trigger, *args, **kwargs):
trigger.sb["args"], trigger.sb["hyphen_arg"] = self.trigger_hyphen_args(self, trigger.sb)
if trigger.sb["hyphen_arg"]:
return self.trigger_hyphen_arg_handler(bot, trigger, trigger.sb)
else:
return function(bot, trigger, *args, **kwargs)
return internal_prerun
return actual_decorator
def prerun(self, trigger_command_type='module'): def prerun(self, trigger_command_type='module'):
def actual_decorator(function): def actual_decorator(function):
@functools.wraps(function) @functools.wraps(function)
@ -52,21 +64,12 @@ class BotPrerun():
argsdict_list = self.trigger_argsdict_list(argsdict_default, and_split) argsdict_list = self.trigger_argsdict_list(argsdict_default, and_split)
# Run the function for all splits # Run the function for all splits
while len(argsdict_list): for argsdict in argsdict_list:
if argsdict_list[0]["hyphen_arg"]:
self.trigger_hyphen_arg_handler(bot, trigger, argsdict_list[0])
del argsdict_list[0]
pass
# check if anything prohibits the nick from running the command # check if anything prohibits the nick from running the command
if self.trigger_runstatus(bot, trigger, argsdict_list[0]): if self.trigger_runstatus(bot, trigger, argsdict_list[0]):
trigger.sb = argsdict_list[0] trigger.sb = argsdict
function(bot, trigger, *args, **kwargs) function(bot, trigger, *args, **kwargs)
del argsdict_list[0] return
else:
del argsdict_list[0]
pass
return internal_prerun return internal_prerun
return actual_decorator return actual_decorator
@ -89,13 +92,8 @@ class BotPrerun():
def trigger_argsdict_list(self, argsdict_default, and_split): def trigger_argsdict_list(self, argsdict_default, and_split):
prerun_split = [] prerun_split = []
for trigger_args_part in and_split: for trigger_args_part in and_split:
argsdict_part = copy.deepcopy(argsdict_default) argsdict_part = copy.deepcopy(argsdict_default)
argsdict_part["args"] = spicemanip.main(trigger_args_part, 'create')
trigger_args_part_list = spicemanip.main(trigger_args_part, 'create')
argsdict_part["args"], argsdict_part["hyphen_arg"] = self.trigger_hyphen_args(trigger_args_part_list)
prerun_split.append(argsdict_part) prerun_split.append(argsdict_part)
return prerun_split return prerun_split
@ -120,9 +118,6 @@ class BotPrerun():
def trigger_hyphen_arg_handler(self, bot, trigger, argsdict): def trigger_hyphen_arg_handler(self, bot, trigger, argsdict):
if not argsdict["hyphen_arg"]:
return
# Commands that cannot run via privmsg # Commands that cannot run via privmsg
if argsdict["hyphen_arg"] in ['enable']: if argsdict["hyphen_arg"] in ['enable']: