From f9bedc7f7b040df24593d087ee506965e136d612 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Wed, 31 Jul 2019 00:56:54 +0200
Subject: [PATCH] feat(nks): adding `review` identificator into instance label

---
 .../nukestudio/publish/collect_plates.py      |  6 +-
 .../nukestudio/publish/collect_reviews.py     | 74 ++++---------------
 2 files changed, 16 insertions(+), 64 deletions(-)

diff --git a/pype/plugins/nukestudio/publish/collect_plates.py b/pype/plugins/nukestudio/publish/collect_plates.py
index e68dcd711d..0341fbfa6e 100644
--- a/pype/plugins/nukestudio/publish/collect_plates.py
+++ b/pype/plugins/nukestudio/publish/collect_plates.py
@@ -57,6 +57,9 @@ class CollectPlates(api.InstancePlugin):
             data['asset'], data["subset"], os.path.splitext(data["sourcePath"])[1]
         )
 
+        if "review" in instance.data["families"]:
+            data["label"] += " - review"
+
         # adding SourceResolution if Tag was present
         if instance.data.get("sourceResolution") and instance.data.get("main"):
             item = instance.data["item"]
@@ -72,9 +75,6 @@ class CollectPlates(api.InstancePlugin):
         self.log.debug("Creating instance with name: {}".format(data["name"]))
         instance.context.create_instance(**data)
 
-        # # remove original instance
-        # instance.context.remove(instance)
-
 
 class CollectPlatesData(api.InstancePlugin):
     """Collect plates"""
diff --git a/pype/plugins/nukestudio/publish/collect_reviews.py b/pype/plugins/nukestudio/publish/collect_reviews.py
index 32c5e4f649..84b98b9445 100644
--- a/pype/plugins/nukestudio/publish/collect_reviews.py
+++ b/pype/plugins/nukestudio/publish/collect_reviews.py
@@ -80,7 +80,7 @@ class CollectReviews(api.InstancePlugin):
         ext = os.path.splitext(file)[-1][1:]
 
         # change label
-        instance.data["label"] = "{0} - {1} - ({2})".format(
+        instance.data["label"] = "{0} - {1} - ({2}) - review".format(
             instance.data['asset'], instance.data["subset"], ext
         )
 
@@ -102,15 +102,6 @@ class CollectReviews(api.InstancePlugin):
         }
         instance.data["representations"].append(representation)
 
-        self.log.debug("_ `family`: {}".format(
-            instance.data["family"]))
-        self.log.debug("_ `families`: {}".format(
-            instance.data["families"]))
-        self.log.debug("_ `instance.data`: {}".format(
-            instance.data))
-        self.log.debug("_ `representations`: {}".format(
-            instance.data["representations"]))
-
         self.log.debug("Added representation: {}".format(representation))
 
     def create_thumbnail(self, instance):
@@ -146,63 +137,24 @@ class CollectReviews(api.InstancePlugin):
             thumb_representation)
 
     def version_data(self, instance):
-        name = instance.data["subset"]
-        asset = instance.data["asset"]
-        track = instance.data["track"]
-        version = instance.data["version"]
         item = instance.data["item"]
 
-        # get handles
-        handle_start = int(instance.data["handleStart"])
-        handle_end = int(instance.data["handleEnd"])
-
-        # get source frames
-        source_in = int(instance.data["sourceIn"])
-        source_out = int(instance.data["sourceOut"])
-
-
-        # get source frames
-        frame_start = instance.data.get("frameStart", 1)
-        frame_end = frame_start + (source_out - source_in)
-
-        # get source frames
-        instance.data["sourceInH"] = source_in - handle_start
-        instance.data["sourceOutH"] = source_out + handle_end
-
-        # get timeline frames
-        timeline_in = int(item.timelineIn())
-        timeline_out = int(item.timelineOut())
-
-        # frame-ranges with handles
-        timeline_frame_start = timeline_in - handle_start
-        timeline_frame_end = timeline_out + handle_end
-
-        # get colorspace
-        colorspace = item.sourceMediaColourTransform()  
-
-        # get sequence from context, and fps
-        fps = instance.data["fps"]
+        transfer_data = [
+            "handleStart", "handleEnd", "sourceIn", "sourceOut", "startFrame", "endFrame", "sourceInH", "sourceOutH", "timelineIn", "timelineOut", "timelineInH", "timelineOutH", "asset", "track", "version"
+        ]
 
         version_data = dict()
+        # pass data to version
+        version_data.update({k: instance.data[k] for k in transfer_data})
+
+        # add to data of representation
         version_data.update({
-            "handles": handle_start,
-            "handleStart": handle_start,
-            "handleEnd": handle_end,
-            "sourceIn": source_in,
-            "sourceOut": source_out,
-            "startFrame": frame_start,
-            "endFrame": frame_end,
-            "timelineIn": timeline_in,
-            "timelineOut": timeline_out,
-            "timelineInHandles": timeline_frame_start,
-            "timelineOutHandles": timeline_frame_end,
-            "fps": fps,
-            "colorspace": colorspace,
+            "handles": version_data['handleStart'],
+            "colorspace": item.sourceMediaColourTransform(),
             "families": instance.data["families"],
-            "asset": asset,
-            "subset": name,
-            "track": track,
-            "version": int(version)
+            "subset": instance.data["subset"],
+            "fps": instance.context.data["fps"]
         })
         instance.data["versionData"] = version_data
+
         instance.data["source"] = instance.data["sourcePath"]