help - add a line denoting the end of the listing

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 73ae1fcd015d228180dc7ad8de64dc7a21f6072d..402fdc884eda6e720cb5ba730b12d7f3d5ca4578 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,7 +1,7 @@
 # Erebus IRC bot - Author: John Runyon
 # module loading/unloading/tracking code
 
-import sys
+import sys, time
 import modlib
 
 modules = {}
@@ -10,10 +10,35 @@ dependents = {}
 def isloaded(modname): return modname in modules
 def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
 
-def load(parent, modname):
+def load(parent, modname, dependent=False):
+       #wrapper to call _load and print return
+       if dependent:
+               print "Loading dependency %s..." % (modname),
+       else:
+               print "%09.3f [MOD] [#] Loading %s... " % (time.time() % 100000, modname),
+       modstatus = _load(parent, modname, dependent)
+       if not modstatus:
+               print str(modstatus)
+       elif modstatus == True:
+               if dependent:
+                       print "OK. ",
+               else:
+                       print "OK."
+       else:
+               print modstatus
+       return modstatus
+
+def _load(parent, modname, dependent=False):
        if not isloaded(modname):
-               mod = __import__(modname)
-               reload(mod)
+               sys.path.insert(0, 'modules')
+               try:
+                       mod = __import__(modname)
+                       reload(mod) #in case it's been previously loaded.
+               except BaseException as e: #we don't want even sys.exit() to crash us (in case of malicious module) so use BaseException
+                       return modlib.error(e)
+               finally:
+                       del sys.path[0] #remove ./modules from path, in case there's a name conflict
+
 
                if not hasattr(mod, 'modinfo'):
                        return modlib.error('no modinfo')
@@ -26,7 +51,7 @@ def load(parent, modname):
 
                for dep in mod.modinfo['depends']:
                        if dep not in modules:
-                               depret = load(parent, dep)
+                               depret = load(parent, dep, dependent=True)
                                if not depret:
                                        return
                        dependents[dep].append(modname)
@@ -60,13 +85,14 @@ def reloadmod(parent, modname):
                else: modules[modname].modstop(parent)
 
                try:
-                       return reload(modules[modname])
-               except BaseException, e:
+                       reload(modules[modname])
+               except BaseException as e:
                        return modlib.error(e)
 
-               if modhas(modname, 'modrestarted'): modules[modname].modrestarted(parent)
-               else: modules[modname].modstart(parent)
+               if modhas(modname, 'modrestarted'): ret = modules[modname].modrestarted(parent)
+               else: ret = modules[modname].modstart(parent)
 
+               return ret
        else:
                return load(parent, modname)