Merge pull request #6156 from tokejepsen/bugfix/OP-6382_thumbnail_int…

…egration_problem OP-6382 - Thumbnail Integration Problem
ynput · Jan 25, 2024 · d5643d2 · d5643d2
2 parents 4c0bfa2 + cb9802e
commit d5643d2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -216,6 +216,11 @@ def _create_review_representation(
             instance.data["thumbnailSource"] = first_filepath
 
         review_representation["tags"].append("review")
+
+        # Adding "review" to representation name since it can clash with main
+        # representation if they share the same extension.
+        review_representation["outputName"] = "review"
+
         self.log.debug("Representation {} was marked for review. {}".format(
             review_representation["name"], review_path
         ))

diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py
@@ -189,6 +189,13 @@ def process(self, instance):
                 if len(new_repre["files"]) == 1:
                     new_repre["files"] = new_repre["files"][0]
 
+                # If the source representation has "review" tag, but its not
+                # part of the output defintion tags, then both the
+                # representations will be transcoded in ExtractReview and
+                # their outputs will clash in integration.
+                if "review" in repre.get("tags", []):
+                    added_review = True
+
                 new_representations.append(new_repre)
                 added_representations = True
 

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
@@ -231,7 +231,10 @@ def _main_process(self, instance):
                 "files": jpeg_file,
                 "stagingDir": dst_staging,
                 "thumbnail": True,
-                "tags": new_repre_tags
+                "tags": new_repre_tags,
+                # If source image is jpg then there can be clash when
+                # integrating to making the output name explicit.
+                "outputName": "thumbnail"
             }
 
             # adding representation