mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
use 'get_asset_name_identifier' in global plugins
This commit is contained in:
parent
922c481d95
commit
f38c3f395e
4 changed files with 26 additions and 17 deletions
|
|
@ -30,7 +30,8 @@ import pyblish.api
|
|||
from openpype.client import (
|
||||
get_assets,
|
||||
get_subsets,
|
||||
get_last_versions
|
||||
get_last_versions,
|
||||
get_asset_name_identifier,
|
||||
)
|
||||
from openpype.pipeline.version_start import get_versioning_start
|
||||
|
||||
|
|
@ -60,6 +61,9 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
|
|||
self.log.debug("Querying asset documents for instances.")
|
||||
|
||||
context_asset_doc = context.data.get("assetEntity")
|
||||
context_asset_name = None
|
||||
if context_asset_doc:
|
||||
context_asset_name = get_asset_name_identifier(context_asset_doc)
|
||||
|
||||
instances_with_missing_asset_doc = collections.defaultdict(list)
|
||||
for instance in context:
|
||||
|
|
@ -68,15 +72,15 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
|
|||
|
||||
# There is possibility that assetEntity on instance is already set
|
||||
# which can happen in standalone publisher
|
||||
if (
|
||||
instance_asset_doc
|
||||
and instance_asset_doc["name"] == _asset_name
|
||||
):
|
||||
continue
|
||||
if instance_asset_doc:
|
||||
instance_asset_name = get_asset_name_identifier(
|
||||
instance_asset_doc)
|
||||
if instance_asset_name == _asset_name:
|
||||
continue
|
||||
|
||||
# Check if asset name is the same as what is in context
|
||||
# - they may be different, e.g. in NukeStudio
|
||||
if context_asset_doc and context_asset_doc["name"] == _asset_name:
|
||||
if context_asset_name and context_asset_name == _asset_name:
|
||||
instance.data["assetEntity"] = context_asset_doc
|
||||
|
||||
else:
|
||||
|
|
@ -93,7 +97,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
|
|||
|
||||
asset_docs = get_assets(project_name, asset_names=asset_names)
|
||||
asset_docs_by_name = {
|
||||
asset_doc["name"]: asset_doc
|
||||
get_asset_name_identifier(asset_doc): asset_doc
|
||||
for asset_doc in asset_docs
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ from openpype.client import (
|
|||
get_subsets,
|
||||
get_last_versions,
|
||||
get_representations,
|
||||
get_asset_name_identifier,
|
||||
)
|
||||
from openpype.pipeline.load import get_representation_path_with_anatomy
|
||||
|
||||
|
|
@ -121,12 +122,13 @@ class CollectAudio(pyblish.api.ContextPlugin):
|
|||
asset_docs = get_assets(
|
||||
project_name,
|
||||
asset_names=asset_names,
|
||||
fields=["_id", "name"]
|
||||
fields=["_id", "name", "data.parents"]
|
||||
)
|
||||
|
||||
asset_id_by_name = {}
|
||||
for asset_doc in asset_docs:
|
||||
asset_id_by_name[asset_doc["name"]] = asset_doc["_id"]
|
||||
asset_id_by_name = {
|
||||
get_asset_name_identifier(asset_doc): asset_doc["_id"]
|
||||
for asset_doc in asset_docs
|
||||
}
|
||||
asset_ids = set(asset_id_by_name.values())
|
||||
|
||||
# Query subsets with name define by 'audio_subset_name' attr
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from ayon_api import slugify_string
|
|||
from ayon_api.entity_hub import EntityHub
|
||||
|
||||
from openpype import AYON_SERVER_ENABLED
|
||||
from openpype.client import get_assets
|
||||
from openpype.client import get_assets, get_asset_name_identifier
|
||||
from openpype.pipeline.template_data import (
|
||||
get_asset_template_data,
|
||||
get_task_template_data,
|
||||
|
|
@ -58,7 +58,7 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
|
|||
project_name, asset_names=instances_by_asset_name.keys()
|
||||
)
|
||||
asset_docs_by_name = {
|
||||
asset_doc["name"]: asset_doc
|
||||
get_asset_name_identifier(asset_doc): asset_doc
|
||||
for asset_doc in asset_docs
|
||||
}
|
||||
for asset_name, instances in instances_by_asset_name.items():
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from pprint import pformat
|
|||
|
||||
import pyblish.api
|
||||
|
||||
from openpype.client import get_assets
|
||||
from openpype.client import get_assets, get_asset_name_identifier
|
||||
|
||||
|
||||
class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
|
||||
|
|
@ -34,8 +34,11 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
|
|||
self.log.debug("__ db_assets: {}".format(db_assets))
|
||||
|
||||
asset_db_docs = {
|
||||
str(e["name"]): [str(p) for p in e["data"]["parents"]]
|
||||
for e in db_assets}
|
||||
get_asset_name_identifier(asset_doc): list(
|
||||
asset_doc["data"]["parents"]
|
||||
)
|
||||
for asset_doc in db_assets
|
||||
}
|
||||
|
||||
self.log.debug("__ project_entities: {}".format(
|
||||
pformat(asset_db_docs)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue