From d5d9417dcb54b77e3b8836c4b6bbfa8f6751a02c Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Mon, 4 Mar 2019 18:54:54 +0100
Subject: [PATCH] make sure look collection doesn't overwrite review families,
 change ftrack start and end frame parameters to 'startFrameReview' and
 'endFrameReview'

---
 pype/plugins/ftrack/publish/integrate_ftrack_instances.py | 4 ++--
 pype/plugins/maya/publish/collect_look.py                 | 2 +-
 pype/plugins/maya/publish/collect_model.py                | 2 +-
 pype/plugins/maya/publish/collect_review.py               | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
index 165d1b468d..52dfaa2fd3 100644
--- a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
+++ b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
@@ -63,8 +63,8 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 component_data = {
                     "name": "ftrackreview-mp4",  # Default component name is "main".
                     "metadata": {'ftr_meta': json.dumps({
-                                 'frameIn': int(instance.data["startFrame"]),
-                                 'frameOut': int(instance.data["startFrame"]),
+                                 'frameIn': int(instance.data['startFrameReview']),
+                                 'frameOut': int(instance.data['startFrameReview']),
                                  'frameRate': 25})}
                                 }
             elif ext in [".jpg", ".jpeg"]:
diff --git a/pype/plugins/maya/publish/collect_look.py b/pype/plugins/maya/publish/collect_look.py
index cb15976772..9c7b17acaa 100644
--- a/pype/plugins/maya/publish/collect_look.py
+++ b/pype/plugins/maya/publish/collect_look.py
@@ -205,7 +205,7 @@ class CollectLook(pyblish.api.InstancePlugin):
 
     """
 
-    order = pyblish.api.CollectorOrder + 0.4
+    order = pyblish.api.CollectorOrder + 0.2
     families = ["look"]
     label = "Collect Look"
     hosts = ["maya"]
diff --git a/pype/plugins/maya/publish/collect_model.py b/pype/plugins/maya/publish/collect_model.py
index f8e25a9fc1..0fe5f29054 100644
--- a/pype/plugins/maya/publish/collect_model.py
+++ b/pype/plugins/maya/publish/collect_model.py
@@ -15,7 +15,7 @@ class CollectModelData(pyblish.api.InstancePlugin):
 
     """
 
-    order = pyblish.api.CollectorOrder + 0.4
+    order = pyblish.api.CollectorOrder + 0.2
     label = 'Collect Model Data'
     families = ["model"]
 
diff --git a/pype/plugins/maya/publish/collect_review.py b/pype/plugins/maya/publish/collect_review.py
index b318a8de40..a0d434cafa 100644
--- a/pype/plugins/maya/publish/collect_review.py
+++ b/pype/plugins/maya/publish/collect_review.py
@@ -60,6 +60,7 @@ class CollectReview(pyblish.api.InstancePlugin):
                     data['step'] = instance.data['step']
                     data['fps'] = instance.data['fps']
                     cmds.setAttr(str(instance) + '.active', 0)
+                    self.log.debug('data {}'.format(instance.context[i].data))
                     instance.context[i].data.update(data)
                     instance.data['remove'] = True
                 i += 1