新增 /home/pi/.dingdang/custom 作为用户个人插件目录

wzpan · Jul 14, 2017 · 5a503e4 · 5a503e4
1 parent 2e90a1a
commit 5a503e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/client/brain.py b/client/brain.py
@@ -34,7 +34,11 @@ def get_plugins(cls):
         """
 
         logger = logging.getLogger(__name__)
-        locations = [dingdangpath.PLUGIN_PATH, dingdangpath.CONTRIB_PATH]
+        locations = [
+            dingdangpath.PLUGIN_PATH,
+            dingdangpath.CONTRIB_PATH,
+            dingdangpath.CUSTOM_PATH
+        ]
         logger.debug("Looking for plugins in: %s",
                      ', '.join(["'%s'" % location for location in locations]))
         plugins = []

diff --git a/client/dingdangpath.py b/client/dingdangpath.py
@@ -10,10 +10,15 @@
 TEMP_PATH = os.path.join(APP_PATH, "temp")
 PLUGIN_PATH = os.path.join(LIB_PATH, "plugins")
 
-CONFIG_PATH = os.path.expanduser(os.getenv
-                                 ('DINGDANG_CONFIG', '~/.dingdang'))
-CONTRIB_PATH = os.path.expanduser(os.getenv
-                                  ('DINGDANG_CONFIG', '~/.dingdang/contrib'))
+CONFIG_PATH = os.path.expanduser(
+    os.getenv('DINGDANG_CONFIG', '~/.dingdang')
+)
+CONTRIB_PATH = os.path.expanduser(
+    os.getenv('DINGDANG_CONFIG', '~/.dingdang/contrib')
+)
+CUSTOM_PATH = os.path.expanduser(
+    os.getenv('DINGDANG_CONFIG', '~/.dingdang/custom')
+)
 
 
 def config(*fname):