From 693ad2ab420fecd18b6dd348809853d423a10973 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 22 May 2019 00:13:29 +0200
Subject: [PATCH] make ftrack integrators more robust and flexible

---
 .../plugins/standalonepublish/publish/collect_ftrack_api.py | 1 +
 .../standalonepublish/publish/integrate_ftrack_api.py       | 2 +-
 .../standalonepublish/publish/integrate_ftrack_instances.py | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pype/plugins/standalonepublish/publish/collect_ftrack_api.py b/pype/plugins/standalonepublish/publish/collect_ftrack_api.py
index 6df998350c..b15211e990 100644
--- a/pype/plugins/standalonepublish/publish/collect_ftrack_api.py
+++ b/pype/plugins/standalonepublish/publish/collect_ftrack_api.py
@@ -24,6 +24,7 @@ class CollectFtrackApi(pyblish.api.ContextPlugin):
         project = os.environ.get('AVALON_PROJECT', '')
         asset = os.environ.get('AVALON_ASSET', '')
         task = os.environ.get('AVALON_TASK', None)
+        self.log.debug(task)
 
         if task:
             result = session.query('Task where\
diff --git a/pype/plugins/standalonepublish/publish/integrate_ftrack_api.py b/pype/plugins/standalonepublish/publish/integrate_ftrack_api.py
index 9eff10ba67..2c35b974f9 100644
--- a/pype/plugins/standalonepublish/publish/integrate_ftrack_api.py
+++ b/pype/plugins/standalonepublish/publish/integrate_ftrack_api.py
@@ -58,7 +58,7 @@ class IntegrateFtrackApi(pyblish.api.InstancePlugin):
         session = instance.context.data["ftrackSession"]
         if instance.context.data.get("ftrackTask"):
             task = instance.context.data["ftrackTask"]
-            name = task['full_name']
+            name = task
             parent = task["parent"]
         elif instance.context.data.get("ftrackEntity"):
             task = None
diff --git a/pype/plugins/standalonepublish/publish/integrate_ftrack_instances.py b/pype/plugins/standalonepublish/publish/integrate_ftrack_instances.py
index 0dc9bb137c..2605d95494 100644
--- a/pype/plugins/standalonepublish/publish/integrate_ftrack_instances.py
+++ b/pype/plugins/standalonepublish/publish/integrate_ftrack_instances.py
@@ -60,7 +60,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 if not comp.get('startFrameReview'):
                     comp['startFrameReview'] = comp['startFrame']
                 if not comp.get('endFrameReview'):
-                    comp['endFrameReview'] = instance.data['endFrame']
+                    comp['endFrameReview'] = comp['endFrame']
                 location = ft_session.query(
                     'Location where name is "ftrack.server"').one()
                 component_data = {
@@ -69,11 +69,11 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                     "metadata": {'ftr_meta': json.dumps({
                                  'frameIn': int(comp['startFrameReview']),
                                  'frameOut': int(comp['endFrameReview']),
-                                 'frameRate': float(comp['frameRate')]})}
+                                 'frameRate': comp['frameRate']})}
                 }
             else:
                 component_data = {
-                    "name": comp['representation']  # Default component name is "main".
+                    "name": comp['name']
                 }
                 location = ft_session.query(
                     'Location where name is "ftrack.unmanaged"').one()