From: CMDR furrycat <elite@furrycat.net>
Date: Thu, 6 Apr 2017 09:43:13 +0000 (+0100)
Subject: Support plugins with __init__.py files.
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=f3a4a5d908221dcea69134d1a44c8727d462ebde;p=furrycat%2Fcatbot.git

Support plugins with __init__.py files.
---

diff --git a/plugins.py b/plugins.py
index 3071384..6da6f3c 100644
--- a/plugins.py
+++ b/plugins.py
@@ -28,12 +28,18 @@ class Plugins(object):
     self.log_level(level)
 
   def refresh(self):
-    for py in glob.glob('plugin/*/*.py'):
+    seen = []
+    for py in glob.glob('plugin/*/__init__.py') + glob.glob('plugin/*/*.py'):
       path = py.split('.py')[0]
       plugin = os.path.basename(path)
       name = os.path.basename(os.path.dirname(py))
+      if name in seen:
+        continue
+      if plugin == '__init__':
+        plugin = name
       if name != plugin:
         continue
+      seen.append(name)
       lib = path.replace('/', '.')
       plugin = plugin[0].upper() + plugin[1:]
       try: