IntegrateProductGroup is using AYON settings

This commit is contained in:
Jakub Trllo 2024-02-15 17:32:45 +01:00
parent 7669e8ff2b
commit 266eb53769
2 changed files with 8 additions and 16 deletions

View file

@ -17,24 +17,24 @@ from ayon_core.lib import (
) )
class IntegrateSubsetGroup(pyblish.api.InstancePlugin): class IntegrateProductGroup(pyblish.api.InstancePlugin):
"""Integrate Subset Group for publish.""" """Integrate Subset Group for publish."""
# Run after CollectAnatomyInstanceData # Run after CollectAnatomyInstanceData
order = pyblish.api.IntegratorOrder - 0.1 order = pyblish.api.IntegratorOrder - 0.1
label = "Subset Group" label = "Product Group"
# Attributes set by settings # Attributes set by settings
subset_grouping_profiles = None product_grouping_profiles = None
def process(self, instance): def process(self, instance):
"""Look into subset group profiles set by settings. """Look into subset group profiles set by settings.
Attribute 'subset_grouping_profiles' is defined by settings. Attribute 'product_grouping_profiles' is defined by settings.
""" """
# Skip if 'subset_grouping_profiles' is empty # Skip if 'product_grouping_profiles' is empty
if not self.subset_grouping_profiles: if not self.product_grouping_profiles:
return return
if instance.data.get("subsetGroup"): if instance.data.get("subsetGroup"):
@ -47,7 +47,7 @@ class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
# Skip if there is no matching profile # Skip if there is no matching profile
filter_criteria = self.get_profile_filter_criteria(instance) filter_criteria = self.get_profile_filter_criteria(instance)
profile = filter_profiles( profile = filter_profiles(
self.subset_grouping_profiles, self.product_grouping_profiles,
filter_criteria, filter_criteria,
logger=self.log logger=self.log
) )
@ -91,7 +91,7 @@ class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
# Return filter criteria # Return filter criteria
return { return {
"families": anatomy_data["family"], "product_types": anatomy_data["family"],
"tasks": task.get("name"), "tasks": task.get("name"),
"hosts": instance.context.data["hostName"], "hosts": instance.context.data["hostName"],
"task_types": task.get("type") "task_types": task.get("type")

View file

@ -426,14 +426,6 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
ayon_extract_thumbnail["background_color"] ayon_extract_thumbnail["background_color"]
) )
if "IntegrateProductGroup" in ayon_publish:
subset_group = ayon_publish.pop("IntegrateProductGroup")
subset_group_profiles = subset_group.pop("product_grouping_profiles")
for profile in subset_group_profiles:
profile["families"] = profile.pop("product_types")
subset_group["subset_grouping_profiles"] = subset_group_profiles
ayon_publish["IntegrateSubsetGroup"] = subset_group
# Cleanup plugin # Cleanup plugin
ayon_cleanup = ayon_publish["CleanUp"] ayon_cleanup = ayon_publish["CleanUp"]
if "patterns" in ayon_cleanup: if "patterns" in ayon_cleanup: