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

diff --git a/ctlmod.py b/ctlmod.py
index 86943d1..f52a776 100644
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,39 +1,99 @@
-import sys
+# Erebus IRC bot - Author: John Runyon
+# module loading/unloading/tracking code
+
+import sys, time
+import modlib
 
 modules = {}
+dependents = {}
 
 def isloaded(modname): return modname in modules
-def modhas(modname, attname): return getattr(self.modules[modname], attname, None) is not None
+def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
+
+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):
+def _load(parent, modname, dependent=False):
 	if not isloaded(modname):
-		mod = __import__(modname)
+		try:
+			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 Exception as e:
+			return modlib.error(e)
+
+
+		if not hasattr(mod, 'modinfo'):
+			return modlib.error('no modinfo')
+
+		if parent.APIVERSION not in mod.modinfo['compatible']:
+			return modlib.error('API-incompatible')
+
 		modules[modname] = mod
+		dependents[modname] = []
+
+		for dep in mod.modinfo['depends']:
+			if dep not in modules:
+				depret = load(parent, dep, dependent=True)
+				if not depret:
+					return
+			dependents[dep].append(modname)
+
+
 		ret = mod.modstart(parent)
-		if not ret:
+		if ret is not None and not ret:
 			del modules[modname]
+			del dependents[modname]
+			for dep in mod.modinfo['depends']:
+				dependents[dep].remove(modname)
 		return ret
-	else:
-		return -1
+	else: #if not isloaded...else:
+		return modlib.error('already loaded')
 
 def unload(parent, modname):
 	if isloaded(modname):
-		self.modules[modname].modstop(parent)
+		for dependent in dependents[modname]:
+			unload(parent, dependent)
+		for dep in dependents[modname]:
+			dependents[dep].remove(modname)
+		ret = modules[modname].modstop(parent)
+		del modules[modname]
+		return ret
 	else:
-		return -1
+		return modlib.error('already unloaded')
 
 def reloadmod(parent, modname):
 	if isloaded(modname):
-		if modhas(modname, 'modrestart'): self.modules[modname].modrestart(parent)
-		else: self.modules[modname].modstop(parent)
+		if modhas(modname, 'modrestart'): modules[modname].modrestart(parent)
+		else: modules[modname].modstop(parent)
 
-		reload(self.modules[modname])
+		try:
+			reload(modules[modname])
+		except BaseException as e:
+			return modlib.error(e)
 
-		if modhas(modname, 'modrestarted'): self.modules[modname].modrestarted(parent)
-		else: self.modules[modname].modstart(parent)
+		if modhas(modname, 'modrestarted'): ret = modules[modname].modrestarted(parent)
+		else: ret = modules[modname].modstart(parent)
 
+		return ret
 	else:
-		load(parent, modname)
+		return load(parent, modname)
+
 
 def loadall(parent, modlist):
 	for m in modlist: load(parent, m)
@@ -41,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')