Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

actually raise exception for !modinfo not found

Browse source
This commit is contained in:
jesopo 2020-02-13 10:13:39 +00:00
parent 1400fe5ce4
commit 8c76f24c65
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core_modules/modules.py
View file

@ -3,6 +3,8 @@
from src import ModuleManager, utils from src import ModuleManager, utils
ERR_NOTLOADED = "Module '%s' isn't loaded"
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _catch(self, name, func): def _catch(self, name, func):
try: try:
@ -10,7 +12,7 @@ class Module(ModuleManager.BaseModule):
except ModuleManager.ModuleNotFoundException: except ModuleManager.ModuleNotFoundException:
raise utils.EventError("Module '%s' not found" % name) raise utils.EventError("Module '%s' not found" % name)
except ModuleManager.ModuleNotLoadedException: except ModuleManager.ModuleNotLoadedException:
raise utils.EventError("Module '%s' isn't loaded" % name) raise utils.EventError(ERR_NOTLOADED % name)
except ModuleManager.ModuleWarning as warning: except ModuleManager.ModuleWarning as warning:
raise utils.EventError("Module '%s' not loaded: %s" % ( raise utils.EventError("Module '%s' not loaded: %s" % (
name, str(warning))) name, str(warning)))
@ -19,11 +21,11 @@ class Module(ModuleManager.BaseModule):
name, str(e))) name, str(e)))
@utils.hook("received.command.modinfo") @utils.hook("received.command.modinfo")
@utils.spec("!<module>string") @utils.spec("!<module>word")
def info(self, event): def info(self, event):
name = event["spec"][0] name = event["spec"][0]
if not name in self.bot.modules.modules: if not name in self.bot.modules.modules:
raise raise utils.EventError(ERR_NOTLOADED % name)
module = self.bot.modules.modules[name] module = self.bot.modules.modules[name]
event_calls = 0 event_calls = 0
@ -63,7 +65,7 @@ class Module(ModuleManager.BaseModule):
def unload(self, event): def unload(self, event):
name = event["spec"][0] name = event["spec"][0]
if not name in self.bot.modules.modules: if not name in self.bot.modules.modules:
raise utils.EventError("Module '%s' isn't loaded" % name) raise utils.EventError(ERR_NOTLOADED % name)
self._catch(name, lambda: self.bot.modules.unload_module(name)) self._catch(name, lambda: self.bot.modules.unload_module(name))
event["stdout"].write("Unloaded '%s'" % name) event["stdout"].write("Unloaded '%s'" % name)