From c49b83ac980ef4f8d9a1f55e361418dbcb34581e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 16 Jun 2020 17:01:58 +0200 Subject: [PATCH 1/2] stop publishing in middle of instance loop --- pype/tools/pyblish_pype/control.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pype/tools/pyblish_pype/control.py b/pype/tools/pyblish_pype/control.py index c454e4c6fa..12c8944642 100644 --- a/pype/tools/pyblish_pype/control.py +++ b/pype/tools/pyblish_pype/control.py @@ -302,6 +302,11 @@ class Controller(QtCore.QObject): "%s was inactive, skipping.." % instance ) continue + # Stop if was stopped + if self.stopped: + self.stopped = False + yield IterationBreak("Stopped") + yield (plugin, instance) else: families = util.collect_families_from_instances( From 13144b18cf4f286c2b20b6c0b871fdfcbb3e5e84 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 17 Jun 2020 10:25:46 +0100 Subject: [PATCH 2/2] Optimize processing Ffmpeg validator is now a context plugin instead of instance. --- pype/plugins/global/publish/validate_ffmpeg_installed.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pype/plugins/global/publish/validate_ffmpeg_installed.py b/pype/plugins/global/publish/validate_ffmpeg_installed.py index f6738e6de1..61127ff96e 100644 --- a/pype/plugins/global/publish/validate_ffmpeg_installed.py +++ b/pype/plugins/global/publish/validate_ffmpeg_installed.py @@ -8,12 +8,11 @@ except ImportError: import errno -class ValidateFFmpegInstalled(pyblish.api.Validator): +class ValidateFFmpegInstalled(pyblish.api.ContextPlugin): """Validate availability of ffmpeg tool in PATH""" order = pyblish.api.ValidatorOrder label = 'Validate ffmpeg installation' - families = ['review'] optional = True def is_tool(self, name): @@ -27,7 +26,7 @@ class ValidateFFmpegInstalled(pyblish.api.Validator): return False return True - def process(self, instance): + def process(self, context): ffmpeg_path = pype.lib.get_ffmpeg_tool_path("ffmpeg") self.log.info("ffmpeg path: `{}`".format(ffmpeg_path)) if self.is_tool(ffmpeg_path) is False: