Now dynamically imports mods!

All mods except for testing mod is removed

Author: scrlys

modloader/__init__.py

@@ -1,4 +1,40 @@
+import os
+import sys
+import importlib
+
+import renpy
+
 import modinfo
 
-import test
-print(modinfo.modlist)
+def get_mod_path():
+    """Get the mod path
+
+    Returns:
+        The full path to the mods folder
+    """
+    #TODO: Use a path combining function
+    return renpy.config.gamedir + "/mods/"
+
+# By setting the import path to the mod folder, we can do something like `import mod`
+# NOTE: To import files in the modloader/ folder, do `from modloader import ...`
+# If we add the modloader to the path, the modlist would get reloaded again
+sys.path.append(get_mod_path())
+
+for mod in os.listdir(get_mod_path()):
+    # Some mods require resources to be recognized by renpy. If a folder exist, force renpy to load it
+    resource_dir = get_mod_path() + mod + "/resource"
+    if os.path.isdir(resource_dir):
+        renpy.config.searchpath.append(resource_dir)
+
+    # Try importing the mod. If all goes well, the mod is imported through the Mod class
+    try:
+        importlib.import_module(mod)
+    except Exception, e:
+        print("Oh no in {}".format(mod))
+        print(e)
+        raise e # Raise it again even though the stacktrace provides nothing useful
+
+# After all mods are loaded, call their respective mod_complete functions
+for mod_name, mod in modinfo.get_mods().iteritems():
+    print("Completing mod {}".format(mod_name))
+    mod.mod_complete()

modloader/modclass.py

@@ -4,6 +4,8 @@ class Mod():
     """The Mod class
 
     This is supposed to act like a superclass for mods.
+    Execution order is as follows:
+    mod_load -> mod_complete
     """
     def mod_info(self):
         """Get the mod info
@@ -13,11 +15,31 @@ def mod_info(self):
         """
         raise Exception("Mod info isn't overriden")
 
+    def mod_load(self):
+        """Executes when a mod is loaded
+
+        This is where you put special renpy code
+        Other mods may not be fully loaded yet. If you want this functionality, see mod_complete
+        """
+        pass
+
+    def mod_complete(self):
+        """Executes when all mods are loaded"""
+        pass
+
 def loadable_mod(clazz):
     """Annotation to add a Mod subclass to the mod list
 
     Args:
         clazz (Mod): The Mod class
+
+    Raises:
+        Exception: If the given class is not a subclass of Mod
     """
+    if not issubclass(clazz, Mod):
+        raise Exception("Class must be a subclass of Mod")
+
     mod = clazz() # Create a new instance of the class
-    modinfo.add_mod(mod.mod_info()[0], mod)
+    mod_name, _, _ = mod.mod_info() # Get just the mod name
+    mod.mod_load() # Load the mod
+    modinfo.add_mod(mod_name, mod)

modloader/modinfo.py

@@ -3,3 +3,6 @@
 def add_mod(mod_name, mod):
 	print("Adding mod {}".format(mod_name))
 	modlist[mod_name] = mod
+
+def get_mods():
+    return modlist