update plugins to use our templates

This commit is contained in:
Milan Kolar 2018-12-14 16:05:43 +01:00
parent 749a6324a6
commit fdf4642d32
5 changed files with 21 additions and 11 deletions

View file

@ -32,7 +32,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
self.log.debug('instance {}'.format(instance))
assumed_data = instance.data["assumedTemplateData"]
assumed_version = assumed_data["version"]
assumed_version = assumed_data["VERSION"]
version_number = int(assumed_version)
family = instance.data['family'].lower()
asset_type = ''

View file

@ -15,9 +15,12 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin):
self.create_destination_template(instance)
template_data = instance.data["assumedTemplateData"]
template = instance.data["template"]
# template = instance.data["template"]
mock_template = template.format(**template_data)
anatomy = instance.context.data['anatomy']
# template = anatomy.publish.path
anatomy_filled = anatomy.format(template_data)
mock_template = anatomy_filled.publish.path
# For now assume resources end up in a "resources" folder in the
# published folder
@ -77,6 +80,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin):
projection={"config": True, "data": True})
template = project["config"]["template"]["publish"]
# anatomy = instance.context.data['anatomy']
asset = io.find_one({"type": "asset",
"name": asset_name,
@ -108,13 +112,13 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin):
hierarchy = os.path.join(*hierarchy)
template_data = {"root": api.Session["AVALON_PROJECTS"],
"project": project_name,
"projectcode": project['data']['code'],
"project": {"name": project_name,
"code": project['data']['code']},
"silo": silo,
"family": instance.data['family'],
"asset": asset_name,
"subset": subset_name,
"version": version_number,
"VERSION": version_number,
"hierarchy": hierarchy,
"representation": "TEMP"}

View file

@ -107,7 +107,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
self.log.info("Verifying version from assumed destination")
assumed_data = instance.data["assumedTemplateData"]
assumed_version = assumed_data["version"]
assumed_version = assumed_data["VERSION"]
if assumed_version != next_version:
raise AttributeError("Assumed version 'v{0:03d}' does not match"
"next version in database "
@ -170,6 +170,8 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# | ||
# |_______|
#
if isinstance(files, list):
collection = files
# Assert that each member has identical suffix
@ -228,8 +230,8 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# for performance reasons.
"context": {
"root": root,
"project": PROJECT,
"projectcode": project['data']['code'],
"project": {"name": PROJECT,
"code": project['data']['code']},
'task': api.Session["AVALON_TASK"],
"silo": asset['silo'],
"asset": ASSET,

View file

@ -47,6 +47,10 @@ class ExtractLook(pype.api.Extractor):
resources = instance.data["resources"]
frame = cmds.currentTime(query=True)
instance.data['startFrame'] = frame
instance.data['endFrame'] = frame
remap = OrderedDict() # needs to be ordered, see color space values
for resource in resources:
attr = resource['attribute']

View file

@ -44,8 +44,8 @@ class ExtractQuicktime(pype.api.Extractor):
def process(self, instance):
self.log.info("Extracting capture..")
start = instance.data["startFrame"]
end = instance.data["endFrame"]
start = instance.data.get("startFrame", 1)
end = instance.data.get("endFrame", 25)
self.log.info("start: {}, end: {}".format(start, end))
handles = instance.data.get("handles", 0)
if handles: