From 44b80357d687c269c516cc68009056d2e2e358ca Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 21 Feb 2024 15:29:01 +0100 Subject: [PATCH] use 'get_product_name' in core functionality --- client/ayon_core/pipeline/create/context.py | 10 +++++----- .../ayon_core/pipeline/create/creator_plugins.py | 14 +++++++------- client/ayon_core/pipeline/create/legacy_create.py | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index c50170f070..76c770eb37 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -2003,12 +2003,12 @@ class CreateContext: # TODO validate types _pre_create_data.update(pre_create_data) - subset_name = creator.get_subset_name( - variant, - task_name, - asset_doc, + subset_name = creator.get_product_name( project_name, - self.host_name + asset_doc, + task_name, + self.host_name, + variant, ) asset_name = get_asset_name_identifier(asset_doc) diff --git a/client/ayon_core/pipeline/create/creator_plugins.py b/client/ayon_core/pipeline/create/creator_plugins.py index 6fa0d2ffa1..9e39409f0c 100644 --- a/client/ayon_core/pipeline/create/creator_plugins.py +++ b/client/ayon_core/pipeline/create/creator_plugins.py @@ -17,7 +17,7 @@ from ayon_core.pipeline.plugin_discover import ( ) from .constants import DEFAULT_VARIANT_VALUE -from .subset_name import get_subset_name +from .product_name import get_product_name from .utils import get_next_versions_for_instances from .legacy_create import LegacyCreator @@ -507,7 +507,7 @@ class BaseCreator: return {} - def get_subset_name( + def get_product_name( self, variant, task_name, @@ -546,13 +546,13 @@ class BaseCreator: variant, task_name, asset_doc, project_name, host_name, instance ) - return get_subset_name( + return get_product_name( + project_name, + asset_doc, + task_name, + host_name, self.family, variant, - task_name, - asset_doc, - project_name, - host_name, dynamic_data=dynamic_data, project_settings=self.project_settings ) diff --git a/client/ayon_core/pipeline/create/legacy_create.py b/client/ayon_core/pipeline/create/legacy_create.py index bc1528b9cd..df0c942ffd 100644 --- a/client/ayon_core/pipeline/create/legacy_create.py +++ b/client/ayon_core/pipeline/create/legacy_create.py @@ -12,7 +12,7 @@ import collections from ayon_core.client import get_asset_by_id from ayon_core.pipeline.constants import AVALON_INSTANCE_ID -from .subset_name import get_subset_name +from .product_name import get_product_name class LegacyCreator(object): @@ -123,7 +123,7 @@ class LegacyCreator(object): return dynamic_data @classmethod - def get_subset_name( + def get_product_name( cls, variant, task_name, asset_id, project_name, host_name=None ): """Return subset name created with entered arguments. @@ -155,13 +155,13 @@ class LegacyCreator(object): project_name, asset_id, fields=["data.tasks"] ) - return get_subset_name( + return get_product_name( + project_name, + asset_doc, + task_name, + host_name, cls.family, variant, - task_name, - asset_doc, - project_name, - host_name, dynamic_data=dynamic_data )