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

Merge branch 'develop' into enhancement/do_not_use_deprecated_log_warn

Browse source
This commit is contained in:
Roy Nieterau 2025-07-23 11:40:47 +02:00 • committed by GitHub
commit 7a40e3389f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

51
client/ayon_core/pipeline/workfile/utils.py
View file

@ -411,8 +411,8 @@ def save_next_version(
) -> None: ) -> None:
"""Save workfile using current context, version and comment. """Save workfile using current context, version and comment.
Helper function to save workfile using current context. Last workfile Helper function to save a workfile using the current context. Last
version + 1 is used if is not passed in. workfile version + 1 is used if is not passed in.
Args: Args:
version (Optional[int]): Workfile version that will be used. Last version (Optional[int]): Workfile version that will be used. Last
@ -480,10 +480,8 @@ def save_next_version(
project_settings=project_settings, project_settings=project_settings,
) )
rootless_dir = workdir.rootless rootless_dir = workdir.rootless
last_workfile = None
if version is None: if version is None:
workfile_extensions = host.get_workfile_extensions()
if not workfile_extensions:
raise ValueError("Host does not have defined file extensions")
workfiles = host.list_workfiles( workfiles = host.list_workfiles(
project_name, folder_entity, task_entity, project_name, folder_entity, task_entity,
prepared_data=ListWorkfilesOptionalData( prepared_data=ListWorkfilesOptionalData(
@ -493,14 +491,18 @@ def save_next_version(
template_key=template_key, template_key=template_key,
) )
) )
versions = { for workfile in workfiles:
workfile.version if workfile.version is None:
for workfile in workfiles continue
if workfile.version is not None if (
} last_workfile is None
or last_workfile.version < workfile.version
):
last_workfile = workfile
version = None version = None
if versions: if last_workfile is not None:
version = max(versions) + 1 version = last_workfile.version + 1
if version is None: if version is None:
version = get_versioning_start( version = get_versioning_start(
@ -514,6 +516,26 @@ def save_next_version(
template_data["version"] = version template_data["version"] = version
template_data["comment"] = comment template_data["comment"] = comment
# Resolve extension
# - Don't fill any if the host does not have defined any -> e.g. if host
# uses directory instead of a file.
# 1. Use the current file extension.
# 2. Use the last known workfile extension.
# 3. Use the first extensions from 'get_workfile_extensions'.
ext = None
workfile_extensions = host.get_workfile_extensions()
if workfile_extensions:
current_path = host.get_current_workfile()
if current_path:
ext = os.path.splitext(current_path)[1].lstrip(".")
elif last_workfile is not None:
ext = os.path.splitext(last_workfile.filepath)[1].lstrip(".")
else:
ext = next(iter(workfile_extensions), None)
if ext:
template_data["ext"] = ext
filename = file_template.format_strict(template_data) filename = file_template.format_strict(template_data)
workfile_path = os.path.join(workdir, filename) workfile_path = os.path.join(workdir, filename)
rootless_path = f"{rootless_dir}/{filename}" rootless_path = f"{rootless_dir}/{filename}"
@ -632,6 +654,11 @@ def copy_workfile_to_context(
if comment: if comment:
template_data["comment"] = comment template_data["comment"] = comment
workfile_extensions = host.get_workfile_extensions()
if workfile_extensions:
ext = os.path.splitext(src_workfile_path)[1].lstrip(".")
template_data["ext"] = ext
workfile_template = anatomy.get_template_item( workfile_template = anatomy.get_template_item(
"work", template_key, "path" "work", template_key, "path"
) )