From 6d566576cb66a20da7058c7344b09bd3ebe31408 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 26 Feb 2024 11:22:17 +0100 Subject: [PATCH] fix 'self.get_product_name' calls --- .../blender/plugins/create/create_workfile.py | 14 ++++++++++++-- client/ayon_core/hosts/photoshop/lib.py | 9 ++++----- .../plugins/create/create_flatten_image.py | 8 ++++---- .../plugins/create/create_colorspace_look.py | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py index 63d35e6da8..d52ace4b65 100644 --- a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py +++ b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py @@ -44,7 +44,12 @@ class CreateWorkfile(BaseCreator, AutoCreator): if not workfile_instance: asset_doc = get_asset_by_name(project_name, asset_name) product_name = self.get_product_name( - task_name, task_name, asset_doc, project_name, host_name + self.default_variant, + task_name, + task_name, + asset_doc, + project_name, + host_name ) data = { "folderPath": asset_name, @@ -74,7 +79,12 @@ class CreateWorkfile(BaseCreator, AutoCreator): # Update instance context if it's different asset_doc = get_asset_by_name(project_name, asset_name) product_name = self.get_product_name( - task_name, task_name, asset_doc, project_name, host_name + self.default_variant, + task_name, + task_name, + asset_doc, + project_name, + host_name ) workfile_instance["folderPath"] = asset_name diff --git a/client/ayon_core/hosts/photoshop/lib.py b/client/ayon_core/hosts/photoshop/lib.py index 9f800300b9..eb7b4acfd5 100644 --- a/client/ayon_core/hosts/photoshop/lib.py +++ b/client/ayon_core/hosts/photoshop/lib.py @@ -52,12 +52,11 @@ class PSAutoCreator(AutoCreator): if existing_instance is None: asset_doc = get_asset_by_name(project_name, asset_name) product_name = self.get_product_name( - project_name, - asset_doc, - task_name, - host_name, - self.product_type, self.default_variant, + task_name, + asset_doc, + project_name, + host_name, ) data = { "folderPath": asset_name, diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py index ad31463e46..d0a92745bb 100644 --- a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py +++ b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py @@ -44,11 +44,11 @@ class AutoImageCreator(PSAutoCreator): if existing_instance is None: product_name = self.get_product_name( - project_name, - asset_doc, - task_name, - host_name, self.default_variant, + task_name, + asset_doc, + project_name, + host_name, ) data = { diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py index b1b50e902a..e9bf60c197 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py @@ -61,8 +61,8 @@ This creator publishes color space look file (LUT). product_name = self.get_product_name( variant=instance_data["variant"], task_name=instance_data["task"] or "Not set", - project_name=self.project_name, asset_doc=asset_doc, + project_name=self.project_name, ) instance_data["creator_attributes"] = {