Fix Pyblish Post Collector bug where plug-ins would still run for dea…

…ctivated instances - Hacky workaround, see: pyblish/pyblish-qml#356 (comment)
BigRoy · Mar 13, 2020 · 5745d21 · 5745d21
1 parent d1c2d1a
commit 5745d21
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/colorbleed/plugins/global/publish/collect_usd_model_bootstrap.py b/colorbleed/plugins/global/publish/collect_usd_model_bootstrap.py
@@ -16,7 +16,7 @@ class CollectUsdModelBootstrap(pyblish.api.InstancePlugin):
 
     """
 
-    order = pyblish.api.CollectorOrder + 0.3
+    order = pyblish.api.CollectorOrder + 0.35
     label = "Collect USD Model bootstrap"
     hosts = ["houdini", "maya"]
     families = ["usdModel"]

diff --git a/colorbleed/plugins/houdini/publish/collect_usd_bootstrap.py b/colorbleed/plugins/houdini/publish/collect_usd_bootstrap.py
@@ -22,7 +22,7 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
 
     """
 
-    order = pyblish.api.CollectorOrder + 0.3
+    order = pyblish.api.CollectorOrder + 0.35
     label = "Collect USD Bootstrap"
     hosts = ["houdini"]
     families = ["colorbleed.usd",

diff --git a/colorbleed/plugins/houdini/publish/collect_usd_layers.py b/colorbleed/plugins/houdini/publish/collect_usd_layers.py
@@ -13,7 +13,7 @@
 class CollectUsdLayers(pyblish.api.InstancePlugin):
     """Collect the USD Layers that have configured save paths."""
 
-    order = pyblish.api.CollectorOrder + 0.3
+    order = pyblish.api.CollectorOrder + 0.35
     label = "Collect USD Layers"
     hosts = ["houdini"]
     families = ["colorbleed.usd"]

diff --git a/colorbleed/plugins/houdini/publish/fix_post_collector_bug.py b/colorbleed/plugins/houdini/publish/fix_post_collector_bug.py
@@ -0,0 +1,24 @@
+import os
+import pyblish.api
+
+# Only do this whenever PYBLISH_QML_POST_COLLECT is used..
+post_collector_order = os.environ.get("PYBLISH_QML_POST_COLLECT", None)
+if post_collector_order is not None:
+
+    class FixPostCollectorBug(pyblish.api.ContextPlugin):
+        """Fix Post Collector bug
+
+        Without this fix the first plug-in that should not trigger in the
+        Post Collector range due to deactivated instances will still
+        trigger until it processes one that should run.
+
+        Also see:
+            https://github.com/pyblish/pyblish-qml/pull/356
+
+        """
+
+        order = float(post_collector_order)
+        label = "Post Collector bug workaround"
+
+        def process(self, context):
+            pass