From: John Runyon <redacted>
Date: Mon, 4 Sep 2023 03:00:15 +0000 (-0600)
Subject: control - add autoload flag to manipulate autoloads
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/de66fe6d5bb5be3278beef5daa4fcff562d256f6

control - add autoload flag to manipulate autoloads
---

diff --git a/TODO b/TODO
index a915322..c00ec4e 100644
--- a/TODO
+++ b/TODO
@@ -31,3 +31,5 @@ vim: expandtab sw=2 ts=2
   - needs to retain comments when config file is saved
 
 - a module for administering channel users (copy from admin_user) and adding/removing channels
+
+- modlib function for parsing option arguments (like !MODLOAD has now)
diff --git a/modules/control.py b/modules/control.py
index 27d3798..2e3dafb 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -33,32 +33,67 @@ def die(bot, user, chan, realtarget, *args):
 	sys.exit(0)
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
-@lib.help("<mod>", "loads a module")
-@lib.argsEQ(1)
+@lib.help("[-autoload] <mod>", "loads a module, optionally marking it for autoloading")
+@lib.argsGE(1)
 def modload(bot, user, chan, realtarget, *args):
-	okay = ctlmod.load(bot.parent, args[0])
+	module = None
+	autoload = False
+	for arg in args:
+		if arg[0] != "-":
+			if module is not None:
+				bot.msg(user, "Wrong number of arguments.")
+				return
+			module = arg
+		elif arg == "-autoload":
+			autoload = True
+		else:
+			bot.msg(user, "Bad option %s" % (arg))
+
+	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.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.argsGE(1)
 def modunload(bot, user, chan, realtarget, *args):
-	if not ctlmod.isloaded(args[0]):
-		bot.msg(user, "%s is not loaded" % (args[0]))
+	module = None
+	autoload = False
+	force = False
+	for arg in args:
+		if arg[0] != "-":
+			if module is not None:
+				bot.msg(user, "Wrong number of arguments.")
+				return
+			module = arg
+		elif arg == "-autoload":
+			autoload = True
+		elif arg == "-force":
+			force = True
+		else:
+			bot.msg(user, "Bad option %s" % (arg))
+
+	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 %s FORCE 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")