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

Mimic generic ExtractROP logic more from #542

Browse source
This commit is contained in:
Roy Nieterau 2024-06-19 19:57:15 +02:00
parent 3de37d0507
commit 020abb84c6
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py
View file

@ -60,7 +60,10 @@ class CollectFrames(plugin.HoudiniInstancePlugin):
# todo: `frames` currently conflicts with "explicit frames" for a
# for a custom frame list. So this should be refactored.
instance.data["frames"] = result
instance.data.update({
"frames": result,
"stagingDir": os.path.dirname(output)
})
@staticmethod
def create_file_list(match, start_frame, end_frame):

24
server_addon/houdini/client/ayon_houdini/plugins/publish/extract_rop.py
View file

@ -24,17 +24,16 @@ class ExtractROP(plugin.HoudiniExtractorPlugin):
rop_node = hou.node(instance.data["instance_node"])
parm = get_output_parameter(rop_node)
filepath = parm.eval()
staging_dir = os.path.dirname(filepath)
files = instance.data["frames"]
first_file = files[0] if isinstance(files, (list, tuple)) else files
_, ext = splitext(
filepath, allowed_multidot_extensions=[
first_file, allowed_multidot_extensions=[
".ass.gz", ".bgeo.sc", ".bgeo.gz",
".bgeo.lzma", ".bgeo.bz2"]
)
render_rop(rop_node)
self.validate_expected_frames(instance, staging_dir)
self.validate_expected_frames(instance)
# In some cases representation name is not the the extension
# TODO: Preferably we remove this very specific naming
@ -49,30 +48,29 @@ class ExtractROP(plugin.HoudiniExtractorPlugin):
"name": name,
"ext": ext,
"files": instance.data["frames"],
"stagingDir": staging_dir,
"stagingDir": instance.data["stagingDir"],
"frameStart": instance.data["frameStartHandle"],
"frameEnd": instance.data["frameEndHandle"],
}
representation = self.update_representation_data(instance,
representation)
instance.data.setdefault("representations", []).append(representation)
instance.data["stagingDir"] = staging_dir
def validate_expected_frames(self, instance, staging_dir):
def validate_expected_frames(self, instance: pyblish.api.Instance):
"""
Validate all expected files in `instance.data["frames"]` exist in
the staging directory.
"""
filenames = instance.data["frames"]
staging_dir = instance.data["stagingDir"]
if isinstance(filenames, str):
# Single frame
filenames = [filenames]
missing_filenames = []
for filename in filenames:
path = os.path.join(staging_dir, filename)
if not os.path.isfile(path):
missing_filenames.append(filename)
missing_filenames = [
filename for filename in filenames
if not os.path.isfile(os.path.join(staging_dir, filename))
]
if missing_filenames:
raise RuntimeError(f"Missing frames: {missing_filenames}")