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

OP-4504 - fix resolving of originalDirname

Browse source 
If instance has originalDirname collected, all repres should use this as a target folder (that allows copying transient items from temporary folders into folder where source item comes from).
This commit is contained in:
Petr Kalis 2022-12-07 17:51:41 +01:00
parent 4c53a77a83
commit 726c8f2cc1
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
openpype/plugins/publish/integrate.py
View file

@ -554,17 +554,13 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# optionals
# retrieve additional anatomy data from representation if exists
if not instance.data.get("originalDirname"):
instance.data["originalDirname"] = stagingdir
for key, anatomy_key in {
# Representation Key: Anatomy data key
"resolutionWidth": "resolution_width",
"resolutionHeight": "resolution_height",
"fps": "fps",
"outputName": "output",
"originalBasename": "originalBasename",
"originalDirname": "originalDirname"
"originalBasename": "originalBasename"
}.items():
# Allow to take value from representation
# if not found also consider instance.data
@ -582,6 +578,14 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
is_udim = bool(repre.get("udim"))
# store as originalDirname only original value without project root
# if instance collected originalDirname it should be used for all repre
# useful to storing transient items, eg. thumbnails, from temp to final
original_directory = instance.data.get("originalDirname") or stagingdir
_rootless = self.get_rootless_path(anatomy, original_directory)
without_root = _rootless[_rootless.rfind('}')+2:]
template_data["originalDirname"] = without_root
is_sequence_representation = isinstance(files, (list, tuple))
if is_sequence_representation:
# Collection of files (sequence)
@ -685,8 +689,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
raise KnownPublishError(
"This is a bug. Representation file name is full path"
)
if not template_data.get("originalBasename"):
template_data["originalBasename"] = fname
template_data["originalBasename"] = fname
# Manage anatomy template data
template_data.pop("frame", None)
if is_udim:
@ -917,8 +920,8 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
Raises
(KnownPublishError)
"""
found, _ = anatomy.find_root_template_from_path(file_path)
if not found:
path = self.get_rootless_path(anatomy, file_path)
if not path:
raise KnownPublishError((
"Destination path {} ".format(file_path) +
"must be in project dir"