control - add autoload flag to manipulate autoloads

diff --git a/TODO b/TODO
index a915322f3e92d6eda3db77c529b922dff262b952..c00ec4ea32005e6b943af445a5dc186807731ecd 100644 (file)
--- 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 27d3798f37ca74304a95b0ed7ecfd154da8d2581..2e3dafb5ad8af206fd71002a9250912c6ec1dd27 100644 (file)
--- 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")