OP-3908 - use caching function from creator

In between cache function was extracted into creator_plugins, use this to standardize betwen different hosts.
This commit is contained in:
Petr Kalis 2022-11-03 10:50:03 +01:00
parent 28e8728cf3
commit d6ffdc93e5
3 changed files with 10 additions and 23 deletions

View file

@ -1,6 +1,5 @@
import os
from Qt import QtWidgets
import collections
import pyblish.api
@ -291,21 +290,3 @@ def containerise(
stub.imprint(layer.id, data)
return layer
def cache_and_get_instances(creator):
"""Cache instances in shared data.
Args:
creator (Creator): Plugin which would like to get instances from host.
Returns:
Dict[str, Dict[str, Any]]: Cached instances list from host
implementation.
"""
shared_key = "openpype.photoshop.instances"
if shared_key not in creator.collection_shared_data:
value = collections.defaultdict(list)
for instance in creator.list_instances():
identifier = instance["creator_identifier"]
value[identifier].append(instance)
creator.collection_shared_data[shared_key] = value
return creator.collection_shared_data[shared_key]

View file

@ -9,7 +9,7 @@ from openpype.pipeline import (
)
from openpype.lib import prepare_template_data
from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
from openpype.hosts.photoshop.api.pipeline import cache_and_get_instances
from openpype.pipeline.create.creator_plugins import cache_and_get_instances
class ImageCreator(Creator):
@ -20,7 +20,10 @@ class ImageCreator(Creator):
description = "Image creator"
def collect_instances(self):
for instance_data in cache_and_get_instances(self):
instances = cache_and_get_instances(self,
"openpype.photoshop.instances",
self.host.list_instances)
for instance_data in instances:
# legacy instances have family=='image'
creator_id = (instance_data.get("creator_identifier") or
instance_data.get("family"))

View file

@ -5,7 +5,7 @@ from openpype.pipeline import (
CreatedInstance,
legacy_io
)
from openpype.hosts.photoshop.api.pipeline import cache_and_get_instances
from openpype.pipeline.create.creator_plugins import cache_and_get_instances
class PSWorkfileCreator(AutoCreator):
@ -18,7 +18,10 @@ class PSWorkfileCreator(AutoCreator):
return []
def collect_instances(self):
for instance_data in cache_and_get_instances(self):
instances = cache_and_get_instances(self,
"openpype.photoshop.instances",
self.host.list_instances)
for instance_data in instances:
creator_id = instance_data.get("creator_identifier")
if creator_id == self.identifier:
subset_name = instance_data["subset"]