X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/44aea37bab48695e5de7552b729f29fdf75f94d9..52c80cff91dce5fa14ae903c6c2bf20533ccca46:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index 27d3798..4939fa1 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -24,7 +24,7 @@ import ctlmod
 from collections import deque
 
 
-@lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
+@lib.hook(('die','restart','exit'), needchan=False, glevel=lib.MANAGER)
 @lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
 	quitmsg = ' '.join(args)
@@ -33,32 +33,47 @@ def die(bot, user, chan, realtarget, *args):
 	sys.exit(0)
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
-@lib.help("<mod>", "loads a module")
+@lib.help("[-autoload] <mod>", "loads a module, optionally marking it for autoloading")
+@lib.flags('autoload')
 @lib.argsEQ(1)
-def modload(bot, user, chan, realtarget, *args):
-	okay = ctlmod.load(bot.parent, args[0])
+def modload(bot, user, chan, realtarget, flags, *args):
+	autoload = flags['autoload']
+	module = args[0]
+
+	if autoload:
+		bot.parent.cfg.set('autoloads', module, 1)
+		bot.msg(user, "Marked %s for autoloading." % (module))
+	okay = ctlmod.load(bot.parent, module)
 	if okay:
-		bot.msg(user, "Loaded %s" % (args[0]))
+		bot.msg(user, "Loaded %s" % (module))
 	else:
-		bot.msg(user, "Error loading %s: %r" % (args[0], okay))
+		bot.msg(user, "Error loading %s: %r" % (module, okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
-@lib.help("<mod> [FORCE]", "unloads a module", "will refuse to unload a module which is depended on by others", "unless you specify FORCE.")
-@lib.argsGE(1)
-def modunload(bot, user, chan, realtarget, *args):
-	if not ctlmod.isloaded(args[0]):
-		bot.msg(user, "%s is not loaded" % (args[0]))
+@lib.help("[-force] [-autoload] <mod>", "unloads a module", "will refuse to unload a module which is depended on by others unless you specify FORCE.", "optionally removes from autoloads")
+@lib.flags('force','autoload')
+@lib.argsEQ(1)
+def modunload(bot, user, chan, realtarget, flags, *args):
+	autoload = flags['autoload']
+	force = flags['force']
+	module = args[0]
+
+	if autoload:
+		bot.parent.cfg.delete('autoloads', module)
+		bot.msg(user, "Unmarked %s for autoloading." % (module))
+	if not ctlmod.isloaded(module):
+		bot.msg(user, "%s is not loaded" % (module))
 		return
-	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]))
+	if len(ctlmod.dependents[module]) > 0:
+		if not force:
+			bot.msg(user, "That module has dependents! Say MODUNLOAD -force %s to unload it and any dependents." % (module))
 			return
 
-	okay = ctlmod.unload(bot.parent, args[0])
+	okay = ctlmod.unload(bot.parent, module)
 	if okay:
-		bot.msg(user, "Unloaded %s" % (args[0]))
+		bot.msg(user, "Unloaded %s" % (module))
 	else:
-		bot.msg(user, "Error unloading %s: %r" % (args[0], okay))
+		bot.msg(user, "Error unloading %s: %r" % (module, okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
 @lib.help("<mod>", "reloads a module")