fix collector to include the new data

This commit is contained in:
Milan Kolar 2019-05-15 16:59:04 +01:00
parent 13d551ba72
commit 0e48fa3399
2 changed files with 13 additions and 14 deletions

View file

@ -55,10 +55,10 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
instance = context.create_instance(subset)
instance.data.update({
"subset": family + subset,
"subset": subset,
"asset": asset_name,
"label": family + subset,
"name": family + subset,
"label": subset,
"name": subset,
"family": family,
"families": [family, 'ftrack'],
})
@ -74,10 +74,9 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
collections, remainder = clique.assemble(component['files'])
if collections:
self.log.debug(collections)
range = collections[0].format('{range}')
instance.data['startFrame'] = range.split('-')[0]
instance.data['endFrame'] = range.split('-')[1]
instance.data['startFrame'] = component['startFrame']
instance.data['endFrame'] = component['endFrame']
instance.data['frameRate'] = component['frameRate']
instance.data["files"].append(component)
instance.data["representations"].append(component)

View file

@ -57,19 +57,19 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
"name": "thumbnail" # Default component name is "main".
}
elif comp['preview']:
if not instance.data.get('startFrameReview'):
instance.data['startFrameReview'] = instance.data['startFrame']
if not instance.data.get('endFrameReview'):
instance.data['endFrameReview'] = instance.data['endFrame']
if not comp.get('startFrameReview'):
comp['startFrameReview'] = comp['startFrame']
if not comp.get('endFrameReview'):
comp['endFrameReview'] = instance.data['endFrame']
location = ft_session.query(
'Location where name is "ftrack.server"').one()
component_data = {
# Default component name is "main".
"name": "ftrackreview-mp4",
"metadata": {'ftr_meta': json.dumps({
'frameIn': int(instance.data['startFrameReview']),
'frameOut': int(instance.data['endFrameReview']),
'frameRate': 25.0})}
'frameIn': int(comp['startFrameReview']),
'frameOut': int(comp['endFrameReview']),
'frameRate': float(comp['frameRate')]})}
}
else:
component_data = {