diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py index f4c1634fbe..0ab5e2794e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py @@ -26,15 +26,9 @@ class CreateAlembicCamera(plugin.HoudiniCreator): pre_create_data) instance_node = hou.node(instance.get("instance_node")) - - filepath = "{staging_dir}/{product_name}/{product_name}.abc".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ) - parms = { - "filename": filepath, + "filename": hou.text.expandString( + "$HIP/pyblish/{}.abc".format(product_name)), "use_sop_path": False, } diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py index abbc1730ec..be5604c01c 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py @@ -39,13 +39,10 @@ class CreateArnoldAss(plugin.HoudiniCreator): parm_template_group.hideFolder("Properties", True) instance_node.setParmTemplateGroup(parm_template_group) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.{ext}".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=self.ext.lstrip(".") # ignore the dot in self.ext + filepath = "{}{}".format( + hou.text.expandString("$HIP/pyblish/"), + "{}.$F4{}".format(product_name, self.ext) ) - parms = { # Render frame range "trange": 1, diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py index 02a41464fc..f65b54a452 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py @@ -37,10 +37,9 @@ class CreateArnoldRop(plugin.HoudiniCreator): ext = pre_create_data.get("image_format") - filepath = "{render_dir}/{product_name}/{product_name}.$F4.{ext}".format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", + filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, ext=ext, ) parms = { @@ -53,10 +52,10 @@ class CreateArnoldRop(plugin.HoudiniCreator): } if pre_create_data.get("export_job"): - ass_filepath = "{render_dir}/{product_name}/ass/{product_name}.$F4.ass".format( - render_dir=hou.text.expandString("$HIP/ayon/renders/"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", + ass_filepath = \ + "{export_dir}{product_name}/{product_name}.$F4.ass".format( + export_dir=hou.text.expandString("$HIP/pyblish/ass/"), + product_name=product_name, ) parms["ar_ass_export_enable"] = 1 parms["ar_ass_file"] = ass_filepath diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py index b6ab391044..3749598b1d 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py @@ -29,14 +29,14 @@ class CreateBGEO(plugin.HoudiniCreator): instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.{ext}".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=pre_create_data.get("bgeo_type") or "bgeo.sc" + file_path = "{}{}".format( + hou.text.expandString("$HIP/pyblish/"), + "{}.$F4.{}".format( + product_name, + pre_create_data.get("bgeo_type") or "bgeo.sc") ) parms = { - "sopoutput": filepath + "sopoutput": file_path } instance_node.parm("trange").set(1) diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py index 6fee077b1c..a25faf0e8e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py @@ -14,7 +14,7 @@ class CreateCompositeSequence(plugin.HoudiniCreator): product_type = "imagesequence" icon = "gears" - ext = "exr" + ext = ".exr" def create(self, product_name, instance_data, pre_create_data): import hou # noqa @@ -28,13 +28,10 @@ class CreateCompositeSequence(plugin.HoudiniCreator): pre_create_data) instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.{ext}".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=self.ext + filepath = "{}{}".format( + hou.text.expandString("$HIP/pyblish/"), + "{}.$F4{}".format(product_name, self.ext) ) - parms = { "trange": 1, "copoutput": filepath diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py index 8cfd06e5ef..d399aa5e15 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py @@ -56,15 +56,9 @@ class CreateHDA(plugin.HoudiniCreator): raise CreatorError( "cannot create hda from node {}".format(to_hda)) - filepath = "{staging_dir}/HDAs/{product_name}.hda".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) - hda_node = to_hda.createDigitalAsset( name=node_name, - hda_file_name=filepath + hda_file_name="$HIP/{}.hda".format(node_name) ) hda_node.layoutChildren() elif self._check_existing(folder_path, node_name): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py index a00527e210..e91ddbc0ac 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py @@ -30,28 +30,19 @@ class CreateKarmaROP(plugin.HoudiniCreator): ext = pre_create_data.get("image_format") - filepath = "{render_dir}/{product_name}/{product_name}.$F4.{ext}".format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", + filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, ext=ext, ) - checkpoint = ( - "{render_dir}/{product_name}/checkpoints/{product_name}.$F4.checkpoint" - .format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ) + checkpoint = "{cp_dir}{product_name}.$F4.checkpoint".format( + cp_dir=hou.text.expandString("$HIP/pyblish/"), + product_name=product_name ) - usd_directory = ( - "{render_dir}/{product_name}/usd/{product_name}_$RENDERID" - .format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) + usd_directory = "{usd_dir}{product_name}_$RENDERID".format( + usd_dir=hou.text.expandString("$HIP/pyblish/renders/usd_renders/"), # noqa + product_name=product_name ) parms = { diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py index 9fa9e969ea..e0cf035c35 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py @@ -25,11 +25,9 @@ class CreateMantraIFD(plugin.HoudiniCreator): instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.ifd".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) + filepath = "{}{}".format( + hou.text.expandString("$HIP/pyblish/"), + "{}.$F4.ifd".format(product_name)) parms = { # Render frame range "trange": 1, diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py index 445296bd6a..64ecf428e9 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py @@ -33,10 +33,9 @@ class CreateMantraROP(plugin.HoudiniCreator): ext = pre_create_data.get("image_format") - filepath = "{render_dir}/{product_name}/{product_name}.$F4.{ext}".format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", + filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, ext=ext, ) @@ -48,14 +47,11 @@ class CreateMantraROP(plugin.HoudiniCreator): } if pre_create_data.get("export_job"): - ifd_filepath = ( - "{staging_dir}/{product_name}/ifd/{product_name}.$F4.ifd" - .format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" + ifd_filepath = \ + "{export_dir}{product_name}/{product_name}.$F4.ifd".format( + export_dir=hou.text.expandString("$HIP/pyblish/ifd/"), + product_name=product_name, ) - ) parms["soho_outputmode"] = 1 parms["soho_diskfile"] = ifd_filepath diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py index 9acd1d6841..4c9a0d9b37 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py @@ -27,13 +27,6 @@ class CreatePointCache(plugin.HoudiniCreator): pre_create_data) instance_node = hou.node(instance.get("instance_node")) - - filepath = "{staging_dir}/{product_name}/{product_name}.abc".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ) - parms = { "use_sop_path": True, "build_from_path": True, @@ -41,7 +34,8 @@ class CreatePointCache(plugin.HoudiniCreator): "prim_to_detail_pattern": "cbId", "format": 2, "facesets": 0, - "filename": filepath + "filename": hou.text.expandString( + "$HIP/pyblish/{}.abc".format(product_name)) } if self.selected_nodes: diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py index 80d19daecf..6a9321b95a 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py @@ -36,14 +36,8 @@ class CreateRedshiftProxy(plugin.HoudiniCreator): instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.rs".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) - parms = { - "RS_archive_file": filepath, + "RS_archive_file": '$HIP/pyblish/{}.$F4.rs'.format(product_name), } if self.selected_nodes: diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py index dc04999018..1cd239e929 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py @@ -63,12 +63,11 @@ class CreateRedshiftROP(plugin.HoudiniCreator): multilayer_mode_index = {"No Multi-Layered EXR File": "1", "Full Multi-Layered EXR File": "2" } - filepath = "{render_dir}/{product_name}/{product_name}.$AOV.$F4.{ext}".format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=ext, - ) + filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, + fmt="$AOV.$F4.{ext}".format(ext=ext) + ) if multilayer_mode_index[multi_layered_mode] == "1": multipart = False @@ -96,11 +95,8 @@ class CreateRedshiftROP(plugin.HoudiniCreator): camera = node.path() parms["RS_renderCamera"] = camera or "" - rs_filepath = "{staging_dir}/{product_name}/rs/{product_name}.$F4.rs".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) + export_dir = hou.text.expandString("$HIP/pyblish/rs/") + rs_filepath = f"{export_dir}{product_name}/{product_name}.$F4.rs" parms["RS_archive_file"] = rs_filepath if pre_create_data.get("split_render", self.split_render): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_review.py b/client/ayon_core/hosts/houdini/plugins/create/create_review.py index fbb74886ee..18f7ce498d 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_review.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_review.py @@ -31,8 +31,8 @@ class CreateReview(plugin.HoudiniCreator): frame_range = hou.playbar.frameRange() - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.{ext}".format( - staging_dir=hou.text.expandString("$HIP/ayon"), + filepath = "{root}/{product_name}/{product_name}.$F4.{ext}".format( + root=hou.text.expandString("$HIP/pyblish"), # keep dynamic link to product name product_name="`chs(\"AYON_productName\")`", ext=pre_create_data.get("image_format") or "png" diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py index bca62207d5..3271107c6e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py @@ -29,15 +29,13 @@ class CreateStaticMesh(plugin.HoudiniCreator): instance_node = hou.node(instance.get("instance_node")) # prepare parms - filepath = "{staging_dir}/{product_name}.fbx".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", + output_path = hou.text.expandString( + "$HIP/pyblish/{}.fbx".format(product_name) ) parms = { "startnode": self.get_selection(), - "sopoutput": filepath, + "sopoutput": output_path, # vertex cache format "vcformat": pre_create_data.get("vcformat"), "convertunits": pre_create_data.get("convertunits"), diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py index 108d7b28b0..700f7eefd6 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py @@ -25,15 +25,8 @@ class CreateUSD(plugin.HoudiniCreator): instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.{ext}".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=self.ext - ) - parms = { - "lopoutput": filepath, + "lopoutput": "$HIP/pyblish/{}.usd".format(product_name), "enableoutputprocessor_simplerelativepaths": False, } diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py index c60a0e47e4..c34cd2b4b5 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py @@ -28,14 +28,11 @@ class CreateVDBCache(plugin.HoudiniCreator): pre_create_data) instance_node = hou.node(instance.get("instance_node")) - filepath = "{staging_dir}/{product_name}/{product_name}.$F4.vdb".format( - staging_dir=hou.text.expandString("$HIP/ayon"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" - ) - + file_path = "{}{}".format( + hou.text.expandString("$HIP/pyblish/"), + "{}.$F4.vdb".format(product_name)) parms = { - "sopoutput": filepath, + "sopoutput": file_path, "initsim": True, "trange": 1 } diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py index f5db4a1e65..5ed9e848a7 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py +++ b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py @@ -56,14 +56,11 @@ class CreateVrayROP(plugin.HoudiniCreator): } if pre_create_data.get("export_job"): - scene_filepath = ( - "{staging_dir}/{product_name}/vrscene/{product_name}.$F4.vrscene" - .format( - staging_dir=hou.text.expandString("$HIP/pyblish"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`" + scene_filepath = \ + "{export_dir}{product_name}/{product_name}.$F4.vrscene".format( + export_dir=hou.text.expandString("$HIP/pyblish/vrscene/"), + product_name=product_name, ) - ) # Setting render_export_mode to "2" because that's for # "Export only" ("1" is for "Export & Render") parms["render_export_mode"] = "2" @@ -84,14 +81,18 @@ class CreateVrayROP(plugin.HoudiniCreator): instance_data["RenderElement"] = pre_create_data.get("render_element_enabled") # noqa if pre_create_data.get("render_element_enabled", True): # Vray has its own tag for AOV file output - filepath = ( - "{render_dir}/{product_name}/{product_name}.$AOV.$F4.{ext}" - .format( - render_dir=hou.text.expandString("$HIP/pyblish/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=ext, - ) + filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, + fmt="${aov}.$F4.{ext}".format(aov="AOV", + ext=ext) + ) + filepath = "{}{}".format( + hou.text.expandString("$HIP/pyblish/renders/"), + "{}/{}.${}.$F4.{}".format(product_name, + product_name, + "AOV", + ext) ) re_rop = instance_node.parent().createNode( "vray_render_channels", @@ -107,14 +108,10 @@ class CreateVrayROP(plugin.HoudiniCreator): }) else: - filepath = ( - "{render_dir}/{product_name}/{product_name}.$F4.{ext}" - .format( - render_dir=hou.text.expandString("$HIP/ayon/renders"), - # keep dynamic link to product name - product_name="`chs(\"AYON_productName\")`", - ext=ext, - ) + filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format( + renders_dir=hou.text.expandString("$HIP/pyblish/renders/"), + product_name=product_name, + fmt="$F4.{ext}".format(ext=ext) ) parms.update({ "use_render_channels": 0,