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

Use self.bot.load_modules in modules.py

Browse source
This commit is contained in:
jesopo 2019-05-27 15:47:47 +01:00
parent 5b90a1a1d4
commit 850ddd0ab4
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/modules.py
View file

@ -45,11 +45,6 @@ class Module(ModuleManager.BaseModule):
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)
def _reload(self, name):
definition = self.bot.modules.find_module(name)
self.bot.modules.unload_module(name)
self.bot.modules.load_module(self.bot, definition)
@utils.hook("received.command.reloadmodule", min_args=1) @utils.hook("received.command.reloadmodule", min_args=1)
def reload(self, event): def reload(self, event):
""" """
@ -68,25 +63,28 @@ class Module(ModuleManager.BaseModule):
:help: Reload all modules :help: Reload all modules
:permission: reload-all-modules :permission: reload-all-modules
""" """
reloaded = [] success = []
failed = [] fail = []
for name in list(self.bot.modules.modules.keys()): for name in list(self.bot.modules.modules.keys()):
try: try:
self._reload(name) self.bot.modules.unload_module(name)
except ModuleManager.ModuleWarning: except ModuleManager.ModuleWarning:
continue continue
except: except:
failed.append(name) fail.append(name)
continue continue
reloaded.append(name) success.append(name)
load_success, load_fail = self.bot.load_modules(safe=True)
success.extend(load_success)
fail.extend(load_fail)
if reloaded and failed: if success and fail:
event["stdout"].write("Reloaded %d modules, %d failed" % ( event["stdout"].write("Reloaded %d modules, %d failed" % (
len(reloaded), len(failed))) len(success), len(fail)))
elif failed: elif fail:
event["stdout"].write("Failed to reload all modules") event["stdout"].write("Failed to reload all modules")
else: else:
event["stdout"].write("Reloaded %d modules" % len(reloaded)) event["stdout"].write("Reloaded %d modules" % len(success))
@utils.hook("received.command.enablemodule", min_args=1) @utils.hook("received.command.enablemodule", min_args=1)
def enable(self, event): def enable(self, event):

3
modules/signals.py
View file

@ -42,9 +42,6 @@ class Module(ModuleManager.BaseModule):
self.bot.config.load() self.bot.config.load()
self.bot.log.info("Reloaded config file", []) self.bot.log.info("Reloaded config file", [])
def _reload(self, name):
self.bot.modules.unload_module(name)
self.bot.modules.load_module(self.bot, name)
def _reload_modules(self): def _reload_modules(self):
self.bot.log.info("Reloading modules", []) self.bot.log.info("Reloading modules", [])