diff --git a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py index a815d9ff9b..4b6b3e828e 100644 --- a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py +++ b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py @@ -26,7 +26,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): 'render': 'render', 'nukescript': 'comp', 'review': 'mov', - 'plate': 'img' + 'plates': 'img' } def process(self, instance): @@ -54,9 +54,11 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): } elif comp.get('preview'): if not comp.get('startFrameReview'): - comp['startFrameReview'] = comp['startFrame'] + comp['startFrameReview'] = instance.data['startFrame'] if not comp.get('endFrameReview'): - comp['endFrameReview'] = comp['endFrame'] + comp['endFrameReview'] = instance.data['endFrame'] + if not comp.get('frameRate'): + comp['frameRate'] = instance.context.data['fps'] location = ft_session.query( 'Location where name is "ftrack.server"').one() component_data = { @@ -65,7 +67,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): "metadata": {'ftr_meta': json.dumps({ 'frameIn': int(comp['startFrameReview']), 'frameOut': int(comp['endFrameReview']), - 'frameRate': comp['frameRate']})} + 'frameRate': float(comp['frameRate'])})} } comp['thumbnail'] = False else: diff --git a/pype/plugins/global/publish/collect_filesequences.py b/pype/plugins/global/publish/collect_filesequences.py index aea3479632..5267da04f4 100644 --- a/pype/plugins/global/publish/collect_filesequences.py +++ b/pype/plugins/global/publish/collect_filesequences.py @@ -194,13 +194,14 @@ class CollectFileSequences(pyblish.api.ContextPlugin): "source": data.get('source', '') }) instance.append(collection) + instance.context.data['fps'] = fps if "representations" not in instance.data: instance.data["representations"] = [] representation = { 'name': ext, - 'ext': '.{}'.format(ext), + 'ext': '{}'.format(ext), 'files': list(collection), "stagingDir": root, "anatomy_template": "render" diff --git a/pype/plugins/global/publish/extract_jpeg.py b/pype/plugins/global/publish/extract_jpeg.py index 88e17f55c7..3c4c2e6775 100644 --- a/pype/plugins/global/publish/extract_jpeg.py +++ b/pype/plugins/global/publish/extract_jpeg.py @@ -67,8 +67,9 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin): representation = { 'name': 'jpg', - 'ext': '.jpg', + 'ext': 'jpg', 'files': jpegFile, "stagingDir": stagingdir, + "thumbnail": True } instance.data["representations"].append(representation) diff --git a/pype/plugins/global/publish/extract_quicktime.py b/pype/plugins/global/publish/extract_quicktime.py index 4c7db34e95..9fbed51fe7 100644 --- a/pype/plugins/global/publish/extract_quicktime.py +++ b/pype/plugins/global/publish/extract_quicktime.py @@ -75,8 +75,9 @@ class ExtractQuicktimeEXR(pyblish.api.InstancePlugin): representation = { 'name': 'mov', - 'ext': '.mov', + 'ext': 'mov', 'files': movFile, "stagingDir": stagingdir, + "preview": True } instance.data["representations"].append(representation)