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

Updated use of first_filepath

Browse source
This commit is contained in:
Petr Kalis 2025-03-10 10:18:21 +01:00
parent bafd3dcf8f
commit 4ea2ed3dc1
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/ayon_core/pipeline/farm/pyblish_functions.py
View file

@ -393,7 +393,7 @@ def prepare_representations(
rep = { rep = {
"name": ext, "name": ext,
"ext": ext, "ext": ext,
"files": files, "files": [os.path.basename(file_path) for file_path in files],
"frameStart": frame_start, "frameStart": frame_start,
"frameEnd": frame_end, "frameEnd": frame_end,
# If expectedFile are absolute, we need only filenames # If expectedFile are absolute, we need only filenames
@ -521,7 +521,7 @@ def _get_real_files_to_render(collection, frames_to_render):
collection (clique.Collection): absolute paths collection (clique.Collection): absolute paths
frames_to_render (list[int]): of int 1001 frames_to_render (list[int]): of int 1001
Returns: Returns:
(list[str]) (list[str]): absolut paths of files to be rendered
Example: Example:
-------- --------
@ -541,8 +541,7 @@ def _get_real_files_to_render(collection, frames_to_render):
collection.padding, collection.padding,
indexes=included_frames indexes=included_frames
) )
real_full_paths = list(real_collection) return list(real_collection)
return [os.path.basename(file_url) for file_url in real_full_paths]
def create_instances_for_aov( def create_instances_for_aov(
@ -783,11 +782,10 @@ def _create_instances_for_aov(
# go through AOVs in expected files # go through AOVs in expected files
for aov, files in expected_files[0].items(): for aov, files in expected_files[0].items():
collected_files = _collect_expected_files_for_aov(files) collected_files = _collect_expected_files_for_aov(files)
staging_dir = ( first_filepath = collected_files
os.path.dirname(collected_files[0]) if isinstance(first_filepath, (list, tuple)):
if isinstance(collected_files, (list, tuple)) first_filepath = first_filepath[0]
else os.path.dirname(collected_files) staging_dir = os.path.dirname(first_filepath)
)
if ( if (
frames_to_render is not None frames_to_render is not None
@ -802,12 +800,6 @@ def _create_instances_for_aov(
frame_end = int(skeleton.get("frameEndHandle")) frame_end = int(skeleton.get("frameEndHandle"))
frames_to_render = list(range(frame_start, frame_end + 1)) frames_to_render = list(range(frame_start, frame_end + 1))
if isinstance(collected_files, (list, tuple)):
expected_filepath = os.path.join(staging_dir, collected_files[0])
else:
expected_filepath = os.path.join(staging_dir, collected_files)
dynamic_data = { dynamic_data = {
"aov": aov, "aov": aov,
"renderlayer": instance.data.get("renderlayer"), "renderlayer": instance.data.get("renderlayer"),
@ -817,7 +809,7 @@ def _create_instances_for_aov(
# TODO: this must be changed to be more robust. Any coincidence # TODO: this must be changed to be more robust. Any coincidence
# of camera name in the file path will be considered as # of camera name in the file path will be considered as
# camera name. This is not correct. # camera name. This is not correct.
camera = [cam for cam in cameras if cam in expected_filepath] camera = [cam for cam in cameras if cam in first_filepath]
# Is there just one camera matching? # Is there just one camera matching?
# TODO: this is not true, we can have multiple cameras in the scene # TODO: this is not true, we can have multiple cameras in the scene
@ -871,7 +863,7 @@ def _create_instances_for_aov(
app = os.environ.get("AYON_HOST_NAME", "") app = os.environ.get("AYON_HOST_NAME", "")
render_file_name = os.path.basename(expected_filepath) render_file_name = os.path.basename(first_filepath)
aov_patterns = aov_filter aov_patterns = aov_filter