Merge remote-tracking branch 'origin/develop' into release/2.2.0

pype/lib.py

@@ -5,6 +5,7 @@ import importlib
 import itertools
 import contextlib
 import subprocess
+import inspect
 
 from .vendor import pather
 from .vendor.pather.error import ParseError
@@ -469,9 +470,7 @@ def filter_pyblish_plugins(plugins):
 
     host = api.current_host()
 
-    presets = config.get_presets().get('plugins', {}).get(host, {}).get(
-        "publish", {}
-    )
+    presets = config.get_presets().get('plugins', {})
 
     # iterate over plugins
     for plugin in plugins[:]:
@@ -479,10 +478,20 @@ def filter_pyblish_plugins(plugins):
         if not presets:
             continue
 
+        file = os.path.normpath(inspect.getsourcefile(plugin))
+        file = os.path.normpath(file)
+
+        # host determined from path
+        host_from_file = file.split(os.path.sep)[-3:-2][0]
+        plugin_kind = file.split(os.path.sep)[-2:-1][0]
+
         try:
-            config_data = presets[plugin.__name__]  # noqa: E501
+            config_data = presets[host]["publish"][plugin.__name__]
         except KeyError:
-            continue
+            try:
+                config_data = presets[host_from_file][plugin_kind][plugin.__name__]  # noqa: E501
+            except KeyError:
+                continue
 
         for option, value in config_data.items():
             if option == "enabled" and value is False:

pype/plugin.py

@@ -2,13 +2,54 @@ import tempfile
 import os
 import pyblish.api
 
+from pypeapp import config
+import inspect
+
 ValidatePipelineOrder = pyblish.api.ValidatorOrder + 0.05
 ValidateContentsOrder = pyblish.api.ValidatorOrder + 0.1
 ValidateSceneOrder = pyblish.api.ValidatorOrder + 0.2
 ValidateMeshOrder = pyblish.api.ValidatorOrder + 0.3
 
 
-class Extractor(pyblish.api.InstancePlugin):
+def imprint_attributes(plugin):
+    """
+    Load presets by class and set them as attributes (if found)
+
+    :param plugin: plugin instance
+    :type plugin: instance
+    """
+    file = inspect.getfile(plugin.__class__)
+    file = os.path.normpath(file)
+    plugin_kind = file.split(os.path.sep)[-2:-1][0]
+    plugin_host = file.split(os.path.sep)[-3:-2][0]
+    plugin_name = type(plugin).__name__
+    try:
+        config_data = config.get_presets()['plugins'][plugin_host][plugin_kind][plugin_name]  # noqa: E501
+    except KeyError:
+        print("preset not found")
+        return
+
+    for option, value in config_data.items():
+        if option == "enabled" and value is False:
+            setattr(plugin, "active", False)
+        else:
+            setattr(plugin, option, value)
+            print("setting {}: {} on {}".format(option, value, plugin_name))
+
+
+class ContextPlugin(pyblish.api.ContextPlugin):
+    def process(cls, *args, **kwargs):
+        imprint_attributes(cls)
+        super(ContextPlugin, cls).process(cls, *args, **kwargs)
+
+
+class InstancePlugin(pyblish.api.InstancePlugin):
+    def process(cls, *args, **kwargs):
+        imprint_attributes(cls)
+        super(ContextPlugin, cls).process(cls, *args, **kwargs)
+
+
+class Extractor(InstancePlugin):
     """Extractor base class.
 
     The extractor base class implements a "staging_dir" function used to

pype/tests/test_pyblish_filter.py

@@ -18,7 +18,7 @@ def test_pyblish_plugin_filter_modifier(printer, monkeypatch):
     assert len(plugins) == 0
     paths = pyblish.api.registered_paths()
     printer("Test if we have no registered plugin paths")
-    print(paths)
+    assert len(paths) == 0
 
     class MyTestPlugin(pyblish.api.InstancePlugin):
         my_test_property = 1