X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/6e2b575fa8dd4d48fe2f7400bb3b9180a4547bb8..3f04e4668f01e9eda6e56d5357cb8afb87c4d871:/ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 0a4c784..f52a776 100644
--- 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,17 +10,33 @@ 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):
-		sys.path.insert(0, 'modules')
 		try:
-			mod = __import__(modname)
+			mod = __import__('modules.'+modname, globals(), locals(), ['*'], -1)
+			# ^ fromlist doesn't actually do anything(?) but it means we don't have to worry about this returning the top-level "modules" object
 			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
+		except Exception as e:
 			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')
@@ -33,7 +49,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)
@@ -85,5 +101,3 @@ def unloadall(parent, modlist):
 	for m in modlist: unload(parent, m)
 def reloadall(parent, modlist):
 	for m in modlist: reloadmod(parent, m)
-
-sys.path.append('modules')