From a13d37ca1afc144683008e31cda9a1a5a503f1a9 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Tue, 1 Jun 2021 17:42:08 +0200
Subject: [PATCH] Hiero: moving review to shot instance

---
 .../hosts/hiero/plugins/publish/extract_thumbnail.py   |  2 +-
 .../hiero/plugins/publish/precollect_instances.py      | 10 +++++++---
 .../plugins/publish/integrate_ftrack_instances.py      |  2 +-
 openpype/plugins/publish/collect_otio_review.py        |  4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/hiero/plugins/publish/extract_thumbnail.py b/openpype/hosts/hiero/plugins/publish/extract_thumbnail.py
index d12e7665bf..25c93bf8c3 100644
--- a/openpype/hosts/hiero/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/hiero/plugins/publish/extract_thumbnail.py
@@ -10,7 +10,7 @@ class ExtractThumnail(openpype.api.Extractor):
 
     label = "Extract Thumnail"
     order = pyblish.api.ExtractorOrder
-    families = ["plate", "take"]
+    families = ["plate", "take", "shot"]
     hosts = ["hiero"]
 
     def process(self, instance):
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_instances.py b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
index 267033a1f1..8ca4ea3e45 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
@@ -102,9 +102,6 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
                 "families": families,
                 "publish": tag_data["publish"],
                 "fps": context.data["fps"],
-                "versionData": {
-                    "colorspace": track_item.sourceMediaColourTransform(),
-                },
 
                 # clip's effect
                 "clipEffectItems": subtracks,
@@ -136,6 +133,13 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             # create audio subset instance
             self.create_audio_instance(context, **data)
 
+            # add colorspace data
+            instance.data.update({
+                "versionData": {
+                    "colorspace": track_item.sourceMediaColourTransform(),
+                }
+            })
+
             # add audioReview attribute to plate instance data
             # if reviewTrack is on
             if tag_data.get("reviewTrack") is not None:
diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 93a07a9fae..70db5bd9d5 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -27,7 +27,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                       'nukescript': 'comp',
                       'write': 'render',
                       'review': 'mov',
-                      'plate': 'img',
+                      'shot': 'img',
                       'audio': 'audio',
                       'workfile': 'scene',
                       'animation': 'cache',
diff --git a/openpype/plugins/publish/collect_otio_review.py b/openpype/plugins/publish/collect_otio_review.py
index 4243926ba3..240e932488 100644
--- a/openpype/plugins/publish/collect_otio_review.py
+++ b/openpype/plugins/publish/collect_otio_review.py
@@ -21,7 +21,7 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
 
     label = "Collect OTIO Review"
     order = pyblish.api.CollectorOrder - 0.57
-    families = ["clip"]
+    families = ["shot"]
     hosts = ["resolve", "hiero"]
 
     def process(self, instance):
@@ -29,7 +29,7 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
         otio_review_clips = []
         otio_timeline = instance.context.data["otioTimeline"]
         otio_clip = instance.data["otioClip"]
-
+        self.log.debug("__ otioClip: {}".format(otio_clip))
         # optionally get `reviewTrack`
         review_track_name = instance.data.get("reviewTrack")