deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 15:09:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

check it

Browse Source
This commit is contained in:
deathbybandaid 2019-07-05 11:11:40 -04:00
parent 396ff2bdfb
commit 5cca211988
1 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
sopel_modules/SpiceBot/Commands.py
View File

@ -271,13 +271,13 @@ class BotCommands():
foldername = str(folderpath).split("/")[-1] foldername = str(folderpath).split("/")[-1]
# check for json reference file # check for json reference file
validcomdict = botread.module_json_to_dict(str(modulefile)) comdict = botread.module_json_to_dict(str(modulefile))
# replace json defaults # replace json defaults
validcomdict["filepath"] = str(modulefile) comdict["filepath"] = str(modulefile)
validcomdict["filename"] = str(filename_base) comdict["filename"] = str(filename_base)
validcomdict["folderpath"] = str(folderpath) comdict["folderpath"] = str(folderpath)
validcomdict["foldername"] = str(foldername) comdict["foldername"] = str(foldername)
detected_lines = [] detected_lines = []
for line in module_file_lines: for line in module_file_lines:
@ -305,43 +305,35 @@ class BotCommands():
if len(detected_lines): if len(detected_lines):
filelinelist = [] filelinelist = []
currentsuccesslines = 0
for detected_line in detected_lines: for detected_line in detected_lines:
try: validcomdict = copy.deepcopy(comdict)
# Commands # Commands
if str(detected_line).startswith("commands"): if str(detected_line).startswith("commands"):
comtype = "module" comtype = "module"
validcoms = eval(str(detected_line).split("commands")[-1]) validcoms = eval(str(detected_line).split("commands")[-1])
elif str(detected_line).startswith("nickname_commands"): elif str(detected_line).startswith("nickname_commands"):
comtype = "nickname" comtype = "nickname"
validcoms = eval(str(detected_line).split("nickname_commands")[-1]) validcoms = eval(str(detected_line).split("nickname_commands")[-1])
elif str(detected_line).startswith("rule"): elif str(detected_line).startswith("rule"):
comtype = "rule" comtype = "rule"
validcoms = eval(str(detected_line).split("rule")[-1]) validcoms = eval(str(detected_line).split("rule")[-1])
if isinstance(validcoms, tuple): if isinstance(validcoms, tuple):
validcoms = list(validcoms) validcoms = list(validcoms)
else: else:
validcoms = [validcoms] validcoms = [validcoms]
for regexcom in ["(.*)", '^\?(.*)']: for regexcom in ["(.*)", '^\?(.*)']:
if regexcom in validcoms: if regexcom in validcoms:
while regexcom in validcoms: while regexcom in validcoms:
validcoms.remove(regexcom) validcoms.remove(regexcom)
if len(validcoms): if len(validcoms):
validcomdict["comtype"] = comtype validcomdict["comtype"] = comtype
validcomdict["validcoms"] = validcoms validcomdict["validcoms"] = validcoms
filelinelist.append(validcomdict) filelinelist.append(validcomdict)
currentsuccesslines += 1
except Exception as e:
addnothing = e
if addnothing:
currentsuccesslines += 0
if len(filelinelist): self.register(validcomdict)
for vcomdict in filelinelist:
self.register(vcomdict)
commands = BotCommands() commands = BotCommands()