From e888a60afe5588d2e7f09a9a76ac6158715890bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <33513211+antirotor@users.noreply.github.com> Date: Mon, 18 May 2020 12:26:02 +0200 Subject: [PATCH 1/6] fixed condition for multipartExr multipartExr tag was looked up in representation tags instead of instance data --- pype/plugins/global/publish/extract_jpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/plugins/global/publish/extract_jpeg.py b/pype/plugins/global/publish/extract_jpeg.py index 40e086db99..2931bb5835 100644 --- a/pype/plugins/global/publish/extract_jpeg.py +++ b/pype/plugins/global/publish/extract_jpeg.py @@ -36,7 +36,7 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin): if not isinstance(repre['files'], list): continue - if "multipartExr" in tags: + if instance.data.get("multipartExr") is True: # ffmpeg doesn't support multipart exrs continue From 0896a6ac9576009ae2f8cafc0eabf5a562f71709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <33513211+antirotor@users.noreply.github.com> Date: Mon, 18 May 2020 12:33:26 +0200 Subject: [PATCH 2/6] fixed mutlipartExr condition --- pype/plugins/global/publish/extract_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/plugins/global/publish/extract_review.py b/pype/plugins/global/publish/extract_review.py index 625c96566d..5b06de9655 100644 --- a/pype/plugins/global/publish/extract_review.py +++ b/pype/plugins/global/publish/extract_review.py @@ -63,7 +63,7 @@ class ExtractReview(pyblish.api.InstancePlugin): tags = repre.get("tags", []) - if "multipartExr" in tags: + if inst_data.get("multipartExr") is True: # ffmpeg doesn't support multipart exrs continue From ce805df6cf089c710173ddb8b6014e941a8c9a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <33513211+antirotor@users.noreply.github.com> Date: Mon, 18 May 2020 12:43:33 +0200 Subject: [PATCH 3/6] fixed multipartExr condition --- pype/plugins/global/publish/extract_burnin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index 7668eafd2a..c278aae534 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -68,7 +68,7 @@ class ExtractBurnin(pype.api.Extractor): for i, repre in enumerate(instance.data["representations"]): self.log.debug("__ i: `{}`, repre: `{}`".format(i, repre)) - if "multipartExr" in repre.get("tags", []): + if instance.data.get("multipartExr") is True: # ffmpeg doesn't support multipart exrs continue From c4c9bb08752572fc47dda3873725f3ee7a1beb3b Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 1 Jun 2020 14:05:03 +0200 Subject: [PATCH 4/6] fixe legacy detection in extract burnin --- pype/plugins/global/publish/extract_burnin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index 8cf54bfa4c..83ad4af1c2 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -58,7 +58,7 @@ class ExtractBurnin(pype.api.Extractor): if "representations" not in instance.data: raise RuntimeError("Burnin needs already created mov to work on.") - if self.profiles is None: + if self.use_legacy_code(instance): return self.legacy_process(instance) self.main_process(instance) @@ -71,6 +71,12 @@ class ExtractBurnin(pype.api.Extractor): self.log.debug(instance.data["representations"]) + def use_legacy_code(self, instance): + presets = instance.context.data.get("presets") + if presets is None and self.profiles is None: + return True + return "burnins" in (presets.get("tools") or {}) + def main_process(self, instance): # TODO get these data from context host_name = os.environ["AVALON_APP"] From dd862db30583921d784efff7b402192aa9fb54ff Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 1 Jun 2020 20:35:55 +0200 Subject: [PATCH 5/6] bump version --- pype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/version.py b/pype/version.py index 43ce13db01..334087f851 100644 --- a/pype/version.py +++ b/pype/version.py @@ -1 +1 @@ -__version__ = "2.9.0" +__version__ = "2.9.1" From 09df26b0ecae383e143f1c9848323ba3344b1bc2 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 1 Jun 2020 20:49:02 +0200 Subject: [PATCH 6/6] ignore case in scene version parsing --- pype/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/lib.py b/pype/lib.py index ca9d573b36..12d4706af8 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -458,7 +458,7 @@ def get_version_from_path(file): v: version number in string ('001') """ - pattern = re.compile(r"[\._]v([0-9]+)") + pattern = re.compile(r"[\._]v([0-9]+)", re.IGNORECASE) try: return pattern.findall(file)[0] except IndexError: