Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak filepaths - make them more consistent

Browse source
This commit is contained in:
MustafaJafar 2024-04-22 18:25:51 +02:00
parent 5efc64fa48
commit effb71e280
17 changed files with 147 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py
View file

@ -26,9 +26,15 @@ 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": hou.text.expandString(
"$HIP/pyblish/{}.abc".format(product_name)),
"filename": filepath,
"use_sop_path": False,
}

9
client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py
View file

@ -39,10 +39,13 @@ class CreateArnoldAss(plugin.HoudiniCreator):
parm_template_group.hideFolder("Properties", True)
instance_node.setParmTemplateGroup(parm_template_group)
filepath = "{}{}".format(
hou.text.expandString("$HIP/pyblish/"),
"{}.$F4{}".format(product_name, self.ext)
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
)
parms = {
# Render frame range
"trange": 1,

15
client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py
View file

@ -37,9 +37,10 @@ class CreateArnoldRop(plugin.HoudiniCreator):
ext = pre_create_data.get("image_format")
filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
product_name=product_name,
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,
)
parms = {
@ -52,10 +53,10 @@ class CreateArnoldRop(plugin.HoudiniCreator):
}
if pre_create_data.get("export_job"):
ass_filepath = \
"{export_dir}{product_name}/{product_name}.$F4.ass".format(
export_dir=hou.text.expandString("$HIP/pyblish/ass/"),
product_name=product_name,
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\")`",
)
parms["ar_ass_export_enable"] = 1
parms["ar_ass_file"] = ass_filepath

12
client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
View file

@ -29,14 +29,14 @@ class CreateBGEO(plugin.HoudiniCreator):
instance_node = hou.node(instance.get("instance_node"))
file_path = "{}{}".format(
hou.text.expandString("$HIP/pyblish/"),
"{}.$F4.{}".format(
product_name,
pre_create_data.get("bgeo_type") or "bgeo.sc")
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"
)
parms = {
"sopoutput": file_path
"sopoutput": filepath
}
instance_node.parm("trange").set(1)

11
client/ayon_core/hosts/houdini/plugins/create/create_composite.py
View file

@ -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,10 +28,13 @@ class CreateCompositeSequence(plugin.HoudiniCreator):
pre_create_data)
instance_node = hou.node(instance.get("instance_node"))
filepath = "{}{}".format(
hou.text.expandString("$HIP/pyblish/"),
"{}.$F4{}".format(product_name, self.ext)
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
)
parms = {
"trange": 1,
"copoutput": filepath

8
client/ayon_core/hosts/houdini/plugins/create/create_hda.py
View file

@ -56,9 +56,15 @@ 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="$HIP/{}.hda".format(node_name)
hda_file_name=filepath
)
hda_node.layoutChildren()
elif self._check_existing(folder_path, node_name):

27
client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py
View file

@ -30,19 +30,28 @@ class CreateKarmaROP(plugin.HoudiniCreator):
ext = pre_create_data.get("image_format")
filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
product_name=product_name,
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,
)
checkpoint = "{cp_dir}{product_name}.$F4.checkpoint".format(
cp_dir=hou.text.expandString("$HIP/pyblish/"),
product_name=product_name
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\")`",
)
)
usd_directory = "{usd_dir}{product_name}_$RENDERID".format(
usd_dir=hou.text.expandString("$HIP/pyblish/renders/usd_renders/"), # noqa
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\")`"
)
)
parms = {

8
client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py
View file

@ -25,9 +25,11 @@ class CreateMantraIFD(plugin.HoudiniCreator):
instance_node = hou.node(instance.get("instance_node"))
filepath = "{}{}".format(
hou.text.expandString("$HIP/pyblish/"),
"{}.$F4.ifd".format(product_name))
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\")`"
)
parms = {
# Render frame range
"trange": 1,

18
client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py
View file

@ -33,9 +33,10 @@ class CreateMantraROP(plugin.HoudiniCreator):
ext = pre_create_data.get("image_format")
filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
product_name=product_name,
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,
)
@ -47,11 +48,14 @@ class CreateMantraROP(plugin.HoudiniCreator):
}
if pre_create_data.get("export_job"):
ifd_filepath = \
"{export_dir}{product_name}/{product_name}.$F4.ifd".format(
export_dir=hou.text.expandString("$HIP/pyblish/ifd/"),
product_name=product_name,
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\")`"
)
)
parms["soho_outputmode"] = 1
parms["soho_diskfile"] = ifd_filepath

10
client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
View file

@ -27,6 +27,13 @@ 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,
@ -34,8 +41,7 @@ class CreatePointCache(plugin.HoudiniCreator):
"prim_to_detail_pattern": "cbId",
"format": 2,
"facesets": 0,
"filename": hou.text.expandString(
"$HIP/pyblish/{}.abc".format(product_name))
"filename": filepath
}
if self.selected_nodes:

8
client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py
View file

@ -36,8 +36,14 @@ 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": '$HIP/pyblish/{}.$F4.rs'.format(product_name),
"RS_archive_file": filepath,
}
if self.selected_nodes:

18
client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py
View file

@ -63,11 +63,12 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
multilayer_mode_index = {"No Multi-Layered EXR File": "1",
"Full Multi-Layered EXR File": "2" }
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)
)
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,
)
if multilayer_mode_index[multi_layered_mode] == "1":
multipart = False
@ -95,8 +96,11 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
camera = node.path()
parms["RS_renderCamera"] = camera or ""
export_dir = hou.text.expandString("$HIP/pyblish/rs/")
rs_filepath = f"{export_dir}{product_name}/{product_name}.$F4.rs"
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\")`"
)
parms["RS_archive_file"] = rs_filepath
if pre_create_data.get("split_render", self.split_render):

4
client/ayon_core/hosts/houdini/plugins/create/create_review.py
View file

@ -31,8 +31,8 @@ class CreateReview(plugin.HoudiniCreator):
frame_range = hou.playbar.frameRange()
filepath = "{root}/{product_name}/{product_name}.$F4.{ext}".format(
root=hou.text.expandString("$HIP/pyblish"),
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("image_format") or "png"

8
client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
View file

@ -29,13 +29,15 @@ class CreateStaticMesh(plugin.HoudiniCreator):
instance_node = hou.node(instance.get("instance_node"))
# prepare parms
output_path = hou.text.expandString(
"$HIP/pyblish/{}.fbx".format(product_name)
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\")`",
)
parms = {
"startnode": self.get_selection(),
"sopoutput": output_path,
"sopoutput": filepath,
# vertex cache format
"vcformat": pre_create_data.get("vcformat"),
"convertunits": pre_create_data.get("convertunits"),

9
client/ayon_core/hosts/houdini/plugins/create/create_usd.py
View file

@ -25,8 +25,15 @@ 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": "$HIP/pyblish/{}.usd".format(product_name),
"lopoutput": filepath,
"enableoutputprocessor_simplerelativepaths": False,
}

11
client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py
View file

@ -28,11 +28,14 @@ class CreateVDBCache(plugin.HoudiniCreator):
pre_create_data)
instance_node = hou.node(instance.get("instance_node"))
file_path = "{}{}".format(
hou.text.expandString("$HIP/pyblish/"),
"{}.$F4.vdb".format(product_name))
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\")`"
)
parms = {
"sopoutput": file_path,
"sopoutput": filepath,
"initsim": True,
"trange": 1
}

43
client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py
View file

@ -56,11 +56,14 @@ class CreateVrayROP(plugin.HoudiniCreator):
}
if pre_create_data.get("export_job"):
scene_filepath = \
"{export_dir}{product_name}/{product_name}.$F4.vrscene".format(
export_dir=hou.text.expandString("$HIP/pyblish/vrscene/"),
product_name=product_name,
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\")`"
)
)
# Setting render_export_mode to "2" because that's for
# "Export only" ("1" is for "Export & Render")
parms["render_export_mode"] = "2"
@ -81,18 +84,14 @@ 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 = "{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)
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,
)
)
re_rop = instance_node.parent().createNode(
"vray_render_channels",
@ -108,10 +107,14 @@ class CreateVrayROP(plugin.HoudiniCreator):
})
else:
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)
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,
)
)
parms.update({
"use_render_channels": 0,