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

diff --git a/modules/control.py b/modules/control.py
index 929fc25..4939fa1 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -24,42 +24,56 @@ 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)
 	for botitem in bot.parent.bots.values():
 		bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
 	sys.exit(0)
-	os._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")
@@ -80,7 +94,7 @@ def modreload(bot, user, chan, realtarget, *args):
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
 	mods = ctlmod.modules
-	for modname, mod in mods.items():
+	for modname, mod in sorted(mods.items()):
 		bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
 	bot.msg(user, "Done.")
 
@@ -92,14 +106,16 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 	fmt = "%(auth)s"
 
 	if showglevel and user.glevel >= 1:
-			fillers['glevel'] = user.glevel
-			fmt += " (global access: %(glevel)s)"
+		fillers['glevel'] = user.glevel
+		fmt += " (global access: %(glevel)s)"
 	elif user.glevel >= 1:
 		fmt += " (staff)"
+	elif user.glevel <= -2:
+		fmt += " (ignored)"
 	else:
 		fmt += " (not staff)"
 
-	if showclevel and chan is not None:
+	if (showclevel or showglevel) and chan is not None:
 		clev = chan.levelof(user.auth)
 		if clev >= 1:
 			fillers['clevel'] = (lib.clevs[clev] if clev < len(lib.clevs) else clev)