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

re-use comment from current file

Browse source
This commit is contained in:
Jakub Trllo 2025-07-24 11:05:41 +02:00
parent 50e6c541f9
commit eea1f4cb6a
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -429,6 +429,11 @@ def save_next_version(
from ayon_core.pipeline.context_tools import registered_host from ayon_core.pipeline.context_tools import registered_host
host = registered_host() host = registered_host()
current_path = host.get_current_workfile()
if not current_path:
current_path = None
else:
current_path = os.path.normpath(current_path)
context = host.get_current_context() context = host.get_current_context()
project_name = context["project_name"] project_name = context["project_name"]
@ -483,6 +488,7 @@ def save_next_version(
) )
rootless_dir = workdir.rootless rootless_dir = workdir.rootless
last_workfile = None last_workfile = None
current_workfile = None
if version is None: if version is None:
workfiles = host.list_workfiles( workfiles = host.list_workfiles(
project_name, folder_entity, task_entity, project_name, folder_entity, task_entity,
@ -496,6 +502,10 @@ def save_next_version(
for workfile in workfiles: for workfile in workfiles:
if workfile.version is None: if workfile.version is None:
continue continue
if current_workfile is None and workfile.filepath == current_path:
current_workfile = workfile
if ( if (
last_workfile is None last_workfile is None
or last_workfile.version < workfile.version or last_workfile.version < workfile.version
@ -515,11 +525,18 @@ def save_next_version(
product_type="workfile" product_type="workfile"
) )
if comment is None and last_workfile is not None: # Re-use comment if is not set
comment = last_workfile.comment if comment is None:
if current_workfile is not None:
# Use 'comment' from the current workfile if is set
comment = current_workfile.comment
elif last_workfile is not None:
# Use 'comment' from the last workfile
comment = last_workfile.comment
template_data["version"] = version template_data["version"] = version
template_data["comment"] = comment if comment:
template_data["comment"] = comment
# Resolve extension # Resolve extension
# - Don't fill any if the host does not have defined any -> e.g. if host # - Don't fill any if the host does not have defined any -> e.g. if host
@ -530,7 +547,6 @@ def save_next_version(
ext = None ext = None
workfile_extensions = host.get_workfile_extensions() workfile_extensions = host.get_workfile_extensions()
if workfile_extensions: if workfile_extensions:
current_path = host.get_current_workfile()
if current_path: if current_path:
ext = os.path.splitext(current_path)[1].lstrip(".") ext = os.path.splitext(current_path)[1].lstrip(".")
elif last_workfile is not None: elif last_workfile is not None: