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

Merge pull request #907 from BigRoy/chore/deliver_versions_remove_legacy_code

Browse source 
Deliver versions: Remove legacy code
This commit is contained in:
Jakub Trllo 2024-09-25 11:20:42 +02:00 • committed by GitHub
commit af0159ae4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

75
client/ayon_core/plugins/load/delivery.py
View file

@ -17,8 +17,7 @@ from ayon_core.pipeline.load import get_representation_path_with_anatomy
from ayon_core.pipeline.delivery import ( from ayon_core.pipeline.delivery import (
get_format_dict, get_format_dict,
check_destination_path, check_destination_path,
deliver_single_file, deliver_single_file
deliver_sequence,
) )
@ -231,51 +230,39 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
self.log self.log
] ]
if repre.get("files"): src_paths = []
src_paths = [] for repre_file in repre["files"]:
for repre_file in repre["files"]: src_path = self.anatomy.fill_root(repre_file["path"])
src_path = self.anatomy.fill_root(repre_file["path"]) src_paths.append(src_path)
src_paths.append(src_path) sources_and_frames = collect_frames(src_paths)
sources_and_frames = collect_frames(src_paths)
frames = set(sources_and_frames.values()) frames = set(sources_and_frames.values())
frames.discard(None) frames.discard(None)
first_frame = None first_frame = None
if frames: if frames:
first_frame = min(frames) first_frame = min(frames)
for src_path, frame in sources_and_frames.items(): for src_path, frame in sources_and_frames.items():
args[0] = src_path args[0] = src_path
# Renumber frames # Renumber frames
if renumber_frame and frame is not None: if renumber_frame and frame is not None:
# Calculate offset between # Calculate offset between
# first frame and current frame # first frame and current frame
# - '0' for first frame # - '0' for first frame
offset = frame_offset - int(first_frame) offset = frame_offset - int(first_frame)
# Add offset to new frame start # Add offset to new frame start
dst_frame = int(frame) + offset dst_frame = int(frame) + offset
if dst_frame < 0: if dst_frame < 0:
msg = "Renumber frame has a smaller number than original frame" # noqa msg = "Renumber frame has a smaller number than original frame" # noqa
report_items[msg].append(src_path) report_items[msg].append(src_path)
self.log.warning("{} <{}>".format( self.log.warning("{} <{}>".format(
msg, dst_frame)) msg, dst_frame))
continue continue
frame = dst_frame frame = dst_frame
if frame is not None: if frame is not None:
anatomy_data["frame"] = frame anatomy_data["frame"] = frame
new_report_items, uploaded = deliver_single_file(*args) new_report_items, uploaded = deliver_single_file(*args)
report_items.update(new_report_items)
self._update_progress(uploaded)
else: # fallback for Pype2 and representations without files
frame = repre["context"].get("frame")
if frame:
repre["context"]["frame"] = len(str(frame)) * "#"
if not frame:
new_report_items, uploaded = deliver_single_file(*args)
else:
new_report_items, uploaded = deliver_sequence(*args)
report_items.update(new_report_items) report_items.update(new_report_items)
self._update_progress(uploaded) self._update_progress(uploaded)