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

diff --git a/ctlmod.py b/ctlmod.py
index 86943d1..db8a5b8 100644
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,39 +1,83 @@
+# Erebus IRC bot - Author: John Runyon
+# module loading/unloading/tracking code
+
 import sys
+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):
 	if not isloaded(modname):
-		mod = __import__(modname)
+		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')
+
+		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)
+				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)