Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(celactoin, global): metadata json folder fixes on path

Browse source
This commit is contained in:
Jakub Jezek 2020-07-28 15:39:18 +02:00
parent eb9f9173c5
commit 2d553e5cc4
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pype/plugins/celaction/publish/collect_render_path.py
View file

@ -12,7 +12,7 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
# Presets # Presets
anatomy_render_key = None anatomy_render_key = None
anatomy_publish_render_key = None publish_render_metadata = None
def process(self, instance): def process(self, instance):
anatomy = instance.context.data["anatomy"] anatomy = instance.context.data["anatomy"]
@ -28,7 +28,7 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
# get anatomy rendering keys # get anatomy rendering keys
anatomy_render_key = self.anatomy_render_key or "render" 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 # get folder and path for rendering images from celaction
render_dir = anatomy_filled[anatomy_render_key]["folder"] render_dir = anatomy_filled[anatomy_render_key]["folder"]
@ -46,8 +46,11 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
instance.data["path"] = render_path instance.data["path"] = render_path
# get anatomy for published renders folder path # get anatomy for published renders folder path
if anatomy_filled.get(anatomy_publish_render_key): if anatomy_filled.get(publish_render_metadata):
instance.data["publishRenderFolder"] = anatomy_filled[ instance.data["publishRenderMetadataFolder"] = anatomy_filled[
anatomy_publish_render_key]["folder"] 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}`") self.log.info(f"Render output path set to: `{render_path}`")

10
pype/plugins/global/publish/submit_publish_job.py
View file

@ -206,7 +206,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
def _create_metadata_path(self, instance): def _create_metadata_path(self, instance):
ins_data = instance.data ins_data = instance.data
# Ensure output dir exists # Ensure output dir exists
output_dir = ins_data.get("publishRenderFolder", ins_data["outputDir"]) output_dir = ins_data.get(
"publishRenderMetadataFolder", ins_data["outputDir"])
try: try:
if not os.path.isdir(output_dir): if not os.path.isdir(output_dir):
@ -715,6 +716,13 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
if item in instance.data.get("families", []): if item in instance.data.get("families", []):
instance_skeleton_data["families"] += [item] instance_skeleton_data["families"] += [item]
if "render.farm" in instance.data["families"]:
instance_skeleton_data.update({
"family": "render2d",
"families": ["render"] + [f for f in instance.data["families"]
if "render.farm" not in f]
})
# transfer specific properties from original instance based on # transfer specific properties from original instance based on
# mapping dictionary `instance_transfer` # mapping dictionary `instance_transfer`
for key, values in self.instance_transfer.items(): for key, values in self.instance_transfer.items():