add external_modules directory

3 files changed, 32 insertions, 18 deletions

diff --git a/external_modules/.keep b/external_modules/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/external_modules/.keep
diff --git a/src/ModuleManager.py b/src/ModuleManager.py
index bd9bfa1a..76a3e8ee 100644
--- a/src/ModuleManager.py
+++ b/src/ModuleManager.py
@@ -92,26 +92,27 @@ class ModuleManager(object):
             timers: Timers.Timers,
             config: Config.Config,
             log: Logging.Log,
-            directory: str):
+            directories: typing.List[str]):
         self.events = events
         self.exports = exports
         self.config = config
         self.timers = timers
         self.log = log
-        self.directory = directory
+        self.directories = directories
 
         self.modules = {} # type: typing.Dict[str, LoadedModule]
 
     def list_modules(self) -> typing.List[ModuleDefinition]:
         modules = []
 
-        for file_module in glob.glob(os.path.join(self.directory, "*.py")):
-            modules.append(self.define_module(ModuleType.FILE, file_module))
+        for directory in self.directories:
+            for file_module in glob.glob(os.path.join(directory, "*.py")):
+                modules.append(self.define_module(ModuleType.FILE, file_module))
 
-        for directory_module in glob.glob(os.path.join(
-                self.directory, "*", "__init__.py")):
-            modules.append(self.define_module(ModuleType.DIRECTORY,
-                directory_module))
+            for directory_module in glob.glob(os.path.join(
+                    directory, "*", "__init__.py")):
+                modules.append(self.define_module(ModuleType.DIRECTORY,
+                    directory_module))
         return sorted(modules, key=lambda module: module.name)
 
     def define_module(self, type: ModuleType, filename: str
@@ -127,23 +128,33 @@ class ModuleManager(object):
 
     def find_module(self, name: str) -> ModuleDefinition:
         type = ModuleType.FILE
-        path = self._module_path(name)
+        paths = self._module_paths(name)
 
-        if os.path.isdir(path):
-            type = ModuleType.DIRECTORY
-            path = os.path.join(path, "__init__.py")
-        else:
-            path = "%s.py" % path
+        path = None
+        for path in paths:
+            if os.path.isdir(path):
+                type = ModuleType.DIRECTORY
+                path = os.path.join(path, "__init__.py")
+            else:
+                possible_path = "%s.py" % path
+                if os.path.isfile(possible_path):
+                    path = possible_path
+
+            if path:
+                break
 
-        if not os.path.exists(path):
+        if not path:
             raise ModuleNotFoundException(name)
 
         return self.define_module(type, path)
 
     def _module_name(self, path: str) -> str:
         return os.path.basename(path).rsplit(".py", 1)[0].lower()
-    def _module_path(self, name: str) -> str:
-        return os.path.join(self.directory, name)
+    def _module_paths(self, name: str) -> str:
+        paths = []
+        for directory in self.directories:
+            paths.append(os.path.join(directory, name))
+        return paths
     def _import_name(self, name: str) -> str:
         return "bitbot_%s" % name
 
diff --git a/start.py b/start.py
index 95dd862f..c6d518a5 100755
--- a/start.py
+++ b/start.py
@@ -86,8 +86,11 @@ config = Config.Config(args.config)
 events = EventManager.EventRoot(log).wrap()
 exports = Exports.Exports()
 timers = Timers.Timers(database, events, log)
+
+module_directories = [os.path.join(directory, "modules"),
+    os.path.join(directory, "external_modules")]
 modules = ModuleManager.ModuleManager(events, exports, timers, config, log,
-    os.path.join(directory, "modules"))
+    module_directories)
 
 bot = IRCBot.Bot(directory, args, cache, config, database, events,
     exports, log, modules, timers)