From 6f8a860f00c76a5d3b93d96155bec8fda0343889 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Sat, 22 Feb 2020 01:19:32 +0100
Subject: [PATCH] rendering is done by default from published file

---
 .../global/publish/submit_publish_job.py      |  2 +-
 pype/plugins/maya/publish/collect_render.py   |  4 ++
 .../maya/publish/submit_maya_deadline.py      | 57 +++++++++++++++++--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index df00803326..29dce58101 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -662,8 +662,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                     new_i = copy(i)
                     new_i["version"] = at.get("version")
                     new_i["subset"] = at.get("subset")
-                    new_i["family"] = at.get("family")
                     new_i["append"] = True
+                    new_i["families"].append(at.get("family"))
                     new_instances.append(new_i)
                     self.log.info("  - {} / v{}".format(
                         at.get("subset"), at.get("version")))
diff --git a/pype/plugins/maya/publish/collect_render.py b/pype/plugins/maya/publish/collect_render.py
index f76ee1120f..07eec4192f 100644
--- a/pype/plugins/maya/publish/collect_render.py
+++ b/pype/plugins/maya/publish/collect_render.py
@@ -101,6 +101,10 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 render_instance = instance
                 render_instance.data["remove"] = True
 
+            # make sure workfile instance publishing is enabled
+            if 'workfile' in instance.data['families']:
+                instance.data["publish"] = True
+
         if not render_instance:
             self.log.info("No render instance found, skipping render "
                           "layer collection.")
diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py
index 4c6399a880..2f236be424 100644
--- a/pype/plugins/maya/publish/submit_maya_deadline.py
+++ b/pype/plugins/maya/publish/submit_maya_deadline.py
@@ -117,6 +117,8 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
     else:
         optional = True
 
+    use_published = True
+
     def process(self, instance):
 
         DEADLINE_REST_URL = os.environ.get("DEADLINE_REST_URL",
@@ -125,21 +127,66 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
         context = instance.context
         workspace = context.data["workspaceDir"]
+        anatomy = context.data['anatomy']
 
         filepath = None
 
+        if self.use_published:
+            for i in context:
+                if "workfile" in i.data["families"]:
+                    assert i.data["publish"] is True, (
+                        "Workfile (scene) must be published along")
+                    template_data = i.data.get("anatomyData")
+                    rep = i.data.get("representations")[0].get("name")
+                    template_data["representation"] = rep
+                    template_data["ext"] = rep
+                    template_data["comment"] = None
+                    anatomy_filled = anatomy.format(template_data)
+                    template_filled = anatomy_filled["publish"]["path"]
+                    filepath = os.path.normpath(template_filled)
+                    self.log.info("Using published scene for render {}".format(
+                        filepath))
+
+                    # now we need to switch scene in expected files
+                    # because <scene> token will now point to published
+                    # scene file and that might differ from current one
+                    new_scene = os.path.splitext(
+                        os.path.basename(filepath))[0]
+                    orig_scene = os.path.splitext(
+                        os.path.basename(context.data["currentFile"]))[0]
+                    exp = instance.data.get("expectedFiles")
+
+                    if isinstance(exp[0], dict):
+                        # we have aovs and we need to iterate over them
+                        new_exp = {}
+                        for aov, files in exp[0].items():
+                            replaced_files = []
+                            for f in files:
+                                replaced_files.append(
+                                    f.replace(orig_scene, new_scene)
+                                )
+                            new_exp[aov] = replaced_files
+                        instance.data["expectedFiles"] = [new_exp]
+                    else:
+                        new_exp = []
+                        for f in exp:
+                            new_exp.append(
+                                f.replace(orig_scene, new_scene)
+                            )
+                        instance.data["expectedFiles"] = [new_exp]
+                    self.log.info("Scene name was switched {} -> {}".format(
+                        orig_scene, new_scene
+                    ))
+
         allInstances = []
         for result in context.data["results"]:
             if (result["instance"] is not None and
                result["instance"] not in allInstances):
                 allInstances.append(result["instance"])
 
-        for inst in allInstances:
-            print(inst)
-            if inst.data['family'] == 'scene':
-                filepath = inst.data['destination_list'][0]
-
+        # fallback if nothing was set
         if not filepath:
+            self.log.warning("Falling back to workfile")
             filepath = context.data["currentFile"]
 
         self.log.debug(filepath)