Merge branch 'hotfix/celaction-publish-metadata-json'

ynput · Jul 28, 2020 · b4997d7 · b4997d7
2 parents 5c3e809 + 7df271a
commit b4997d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pype/plugins/celaction/publish/collect_render_path.py b/pype/plugins/celaction/publish/collect_render_path.py
@@ -12,7 +12,7 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
 
     # Presets
     anatomy_render_key = None
-    anatomy_publish_render_key = None
+    publish_render_metadata = None
 
     def process(self, instance):
         anatomy = instance.context.data["anatomy"]
@@ -28,7 +28,7 @@ def process(self, instance):
 
         # get anatomy rendering keys
         anatomy_render_key = self.anatomy_render_key or "render"
-        anatomy_publish_render_key = self.anatomy_publish_render_key or "render"
+        publish_render_metadata = self.publish_render_metadata or "render"
 
         # get folder and path for rendering images from celaction
         render_dir = anatomy_filled[anatomy_render_key]["folder"]
@@ -46,8 +46,11 @@ def process(self, instance):
         instance.data["path"] = render_path
 
         # get anatomy for published renders folder path
-        if anatomy_filled.get(anatomy_publish_render_key):
-            instance.data["publishRenderFolder"] = anatomy_filled[
-                anatomy_publish_render_key]["folder"]
+        if anatomy_filled.get(publish_render_metadata):
+            instance.data["publishRenderMetadataFolder"] = anatomy_filled[
+                publish_render_metadata]["folder"]
+            self.log.info("Metadata render path: `{}`".format(
+                instance.data["publishRenderMetadataFolder"]
+            ))
 
         self.log.info(f"Render output path set to: `{render_path}`")
diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
@@ -206,7 +206,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     def _create_metadata_path(self, instance):
         ins_data = instance.data
         # Ensure output dir exists
-        output_dir = ins_data.get("publishRenderFolder", ins_data["outputDir"])
+        output_dir = ins_data.get(
+            "publishRenderMetadataFolder", ins_data["outputDir"])
 
         try:
             if not os.path.isdir(output_dir):