From baa5ecba3a21c327c7e26d4e66df56e00dbf41cb Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 22 May 2019 00:14:16 +0200
Subject: [PATCH] add task to context and collect context json correctly

---
 .../publish/collect_context.py                | 23 +++++++++----------
 .../widgets/widget_components.py              |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pype/plugins/standalonepublish/publish/collect_context.py b/pype/plugins/standalonepublish/publish/collect_context.py
index 6ac2dca936..055501a50d 100644
--- a/pype/plugins/standalonepublish/publish/collect_context.py
+++ b/pype/plugins/standalonepublish/publish/collect_context.py
@@ -1,9 +1,6 @@
 import os
 import pyblish.api
-from avalon import (
-    io,
-    api as avalon
-)
+from avalon import io
 import json
 import logging
 import clique
@@ -33,13 +30,12 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
         input_json_path = os.environ.get("SAPUBLISH_INPATH")
         output_json_path = os.environ.get("SAPUBLISH_OUTPATH")
 
-        context.data["stagingDir"] = os.path.dirname(input_json_path)
+        # context.data["stagingDir"] = os.path.dirname(input_json_path)
         context.data["returnJsonPath"] = output_json_path
 
         with open(input_json_path, "r") as f:
             in_data = json.load(f)
 
-        project_name = in_data['project']
         asset_name = in_data['asset']
         family = in_data['family']
         subset = in_data['subset']
@@ -67,21 +63,24 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
         instance.data["files"] = list()
         instance.data['destination_list'] = list()
         instance.data['representations'] = list()
+        instance.data['source'] = 'standalone publisher'
 
         for component in in_data['representations']:
-            # instance.add(node)
+
             component['destination'] = component['files']
+            component['stagingDir'] = component['stagingDir']
+            component['anatomy_template'] = 'render'
             collections, remainder = clique.assemble(component['files'])
             if collections:
                 self.log.debug(collections)
-                instance.data['startFrame'] = component['startFrame']
-                instance.data['endFrame'] = component['endFrame']
-                instance.data['frameRate'] = component['frameRate']
+                instance.data['startFrame'] = int(component['startFrame'])
+                instance.data['endFrame'] = int(component['endFrame'])
+                instance.data['frameRate'] = int(component['frameRate'])
 
             instance.data["files"].append(component)
             instance.data["representations"].append(component)
 
-            # "is_thumbnail": component['thumbnail'],
-            # "is_preview": component['preview']
+            instance.data["thumbnail"] = component['thumbnail']
+            instance.data["preview"] = component['preview']
 
         self.log.info(in_data)
diff --git a/pype/standalonepublish/widgets/widget_components.py b/pype/standalonepublish/widgets/widget_components.py
index 1e1fdf88e3..90167f2fa6 100644
--- a/pype/standalonepublish/widgets/widget_components.py
+++ b/pype/standalonepublish/widgets/widget_components.py
@@ -117,7 +117,7 @@ class ComponentsWidget(QtWidgets.QWidget):
         try:
             data = self.parent_widget.collect_data()
             publish.set_context(
-                data['project'], data['asset'], 'standalonepublish'
+                data['project'], data['asset'], data['task'], 'standalonepublish'
             )
             result = publish.publish(data)
             # Clear widgets from components list if publishing was successful