trivia - updated example json

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 0584353afc38b9c82b247569f202d0b8ab521567..74e0a66d4b1b54a6dc124d6f1941260dd0106909 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -44,8 +44,12 @@ def modload(bot, user, chan, realtarget, *args):
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
 @lib.help("<mod>", "unloads a module")
-@lib.argsEQ(1)
+@lib.argsGE(1)
 def modunload(bot, user, chan, realtarget, *args):
+       if len(ctlmod.dependents[args[0]]) > 0:
+               if len(args) == 1 or args[1].lower() != "force":
+                       bot.msg(user, "That module has dependents! Say MODUNLOAD %s FORCE to unload it and any dependents." % (args[0]))
+                       return
        okay = ctlmod.unload(bot.parent, args[0])
        if okay:
                bot.msg(user, "Unloaded %s" % (args[0]))
@@ -67,8 +71,8 @@ def modreload(bot, user, chan, realtarget, *args):
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
        mods = ctlmod.modules
-       for mod in mods.itervalues():
-               bot.msg(user, "- %s (%s)" % (mod.__name__, mod.__file__))
+       for modname, mod in mods.iteritems():
+               bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
        bot.msg(user, "Done.")
 
 def _whois(user, chan, showglevel=True, showclevel=True):