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

revert some of the logic

Browse source
This commit is contained in:
Jakub Trllo 2025-07-24 11:49:00 +02:00
parent 4b5431f267
commit 15854f0706
1 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -418,8 +418,7 @@ def save_next_version(
version (Optional[int]): Workfile version that will be used. Last
version + 1 is used if is not passed in.
comment (optional[str]): Workfile comment. Pass '""' to clear comment.
The last workfile comment is used if it is not passed in and
passed 'version' is 'None'.
The current workfile comment is used if it is not passed.
description (Optional[str]): Workfile description.
prepared_data (Optional[SaveWorkfileOptionalData]): Prepared data
for speed enhancements.
@ -489,7 +488,7 @@ def save_next_version(
rootless_dir = workdir.rootless
last_workfile = None
current_workfile = None
if version is None:
if version is None or comment is None:
workfiles = host.list_workfiles(
project_name, folder_entity, task_entity,
prepared_data=ListWorkfilesOptionalData(
@ -500,39 +499,33 @@ def save_next_version(
)
)
for workfile in workfiles:
if workfile.version is None:
continue
if current_workfile is None and workfile.filepath == current_path:
current_workfile = workfile
if workfile.version is None:
continue
if (
last_workfile is None
or last_workfile.version < workfile.version
):
last_workfile = workfile
version = None
if last_workfile is not None:
version = last_workfile.version + 1
if version is None and last_workfile is not None:
version = last_workfile.version + 1
if version is None:
version = get_versioning_start(
project_name,
host.name,
task_name=task_entity["name"],
task_type=task_entity["taskType"],
product_type="workfile"
)
if version is None:
version = get_versioning_start(
project_name,
host.name,
task_name=task_entity["name"],
task_type=task_entity["taskType"],
product_type="workfile"
)
# Re-use comment if is not set
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
# Re-use comment from the current workfile if is not passed in
if comment is None and current_workfile is not None:
comment = current_workfile.comment
template_data["version"] = version
if comment: