* - change old code to use newer cfg.getboolean instead of bool(int())

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index f52a7768483f71b58102130fb9566269a111c785..dbd2a36bdf5185a9935ea8115b85ea035ddc0d29 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -6,6 +6,7 @@ import modlib
 
 modules = {}
 dependents = {}
+#dependents[modname] = [list of modules which depend on modname]
 
 def isloaded(modname): return modname in modules
 def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
@@ -13,22 +14,29 @@ def modhas(modname, attname): return getattr(modules[modname], attname, None) is
 def load(parent, modname, dependent=False):
        #wrapper to call _load and print return
        if dependent:
-               print "Loading dependency %s..." % (modname),
+               print "(Loading dependency %s..." % (modname),
        else:
-               print "%09.3f [MOD] [#] Loading %s... " % (time.time() % 100000, modname),
+               print "%09.3f [MOD] [?] Loading %s..." % (time.time() % 100000, modname),
        modstatus = _load(parent, modname, dependent)
        if not modstatus:
-               print str(modstatus)
+               if dependent:
+                       print "failed: %s)" % (modstatus),
+               else:
+                       print "failed: %s." % (modstatus)
        elif modstatus == True:
                if dependent:
-                       print "OK. ",
+                       print "OK)",
                else:
                        print "OK."
        else:
-               print modstatus
+               if dependent:
+                       print "OK: %s)" % (modstatus),
+               else:
+                       print "OK: %s." % (modstatus)
        return modstatus
 
 def _load(parent, modname, dependent=False):
+       successstatus = []
        if not isloaded(modname):
                try:
                        mod = __import__('modules.'+modname, globals(), locals(), ['*'], -1)
@@ -48,20 +56,44 @@ def _load(parent, modname, dependent=False):
                dependents[modname] = []
 
                for dep in mod.modinfo['depends']:
-                       if dep not in modules:
-                               depret = load(parent, dep, dependent=True)
-                               if not depret:
-                                       return
+                       if bool(int(parent.cfg.get('autoloads', dep, default=1))):
+                               if dep not in modules:
+                                       depret = load(parent, dep, dependent=True)
+                                       if depret is not None and not depret:
+                                               return depret
+                       else:
+                               return modlib.error("dependent %s disabled" % (dep))
                        dependents[dep].append(modname)
 
+               for dep in mod.modinfo['softdeps']:
+                       if bool(int(parent.cfg.get('autoloads', dep, default=1))):
+                               if dep not in modules:
+                                       depret = load(parent, dep, dependent=True)
+                                       if depret is not None:
+                                               if not depret:
+                                                       successstatus.append("softdep %s failed" % (dep))
+                       else:
+                               successstatus.append("softdep %s disabled" % (dep))
+                       #swallow errors loading - softdeps are preferred, not required
+
 
                ret = mod.modstart(parent)
-               if ret is not None and not ret:
+               if ret is None:
+                       ret = True
+               if not ret:
                        del modules[modname]
                        del dependents[modname]
                        for dep in mod.modinfo['depends']:
                                dependents[dep].remove(modname)
-               return ret
+
+               successstatus = ';'.join(successstatus)
+               if len(successstatus) > 0 and ret:
+                       if ret == True:
+                               return successstatus
+                       else:
+                               return "%s (%s)" % (ret, successstatus)
+               else:
+                       return ret
        else: #if not isloaded...else:
                return modlib.error('already loaded')
 
@@ -69,7 +101,7 @@ def unload(parent, modname):
        if isloaded(modname):
                for dependent in dependents[modname]:
                        unload(parent, dependent)
-               for dep in dependents[modname]:
+               for dep in modules[modname].modinfo['depends']:
                        dependents[dep].remove(modname)
                ret = modules[modname].modstop(parent)
                del modules[modname]