diff --git a/pype/plugins/global/publish/collect_filesequences.py b/pype/plugins/global/publish/collect_filesequences.py index ad128c099b..5c3914aa41 100644 --- a/pype/plugins/global/publish/collect_filesequences.py +++ b/pype/plugins/global/publish/collect_filesequences.py @@ -6,6 +6,7 @@ from pprint import pformat import pyblish.api from avalon import api +import pype.api as pype def collect(root, @@ -64,7 +65,7 @@ def collect(root, return collections -class CollectFileSequences(pyblish.api.ContextPlugin): +class CollectRenderedFrames(pyblish.api.ContextPlugin): """Gather file sequences from working directory When "FILESEQUENCE" environment variable is set these paths (folders or @@ -87,7 +88,7 @@ class CollectFileSequences(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder targets = ["filesequence"] - label = "File Sequences" + label = "RenderedFrames" def process(self, context): if os.environ.get("PYPE_PUBLISH_PATHS"): @@ -128,6 +129,9 @@ class CollectFileSequences(pyblish.api.ContextPlugin): self.log.info("setting session using metadata") api.Session.update(session) os.environ.update(session) + + version = data.get("version") + context.data['version'] = version else: # Search in directory data = dict() @@ -161,6 +165,7 @@ class CollectFileSequences(pyblish.api.ContextPlugin): assert isinstance(families, (list, tuple)), "Must be iterable" assert families, "Must have at least a single family" families.append("ftrack") + families.append("review") for collection in collections: instance = context.create_instance(str(collection)) self.log.info("Collection: %s" % list(collection)) @@ -191,7 +196,8 @@ class CollectFileSequences(pyblish.api.ContextPlugin): "startFrame": start, "endFrame": end, "fps": fps, - "source": data.get('source', '') + "source": data.get('source', ''), + "version": version }) instance.append(collection) instance.context.data['fps'] = fps @@ -205,7 +211,8 @@ class CollectFileSequences(pyblish.api.ContextPlugin): 'files': list(collection), "stagingDir": root, "anatomy_template": "render", - "frameRate": fps + "frameRate": fps, + "tags": ['review'] } instance.data["representations"].append(representation) diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py index 992553cc7e..057fd2362c 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -276,7 +276,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "families": ["render"], "source": source, "user": context.data["user"], - + "version": context.data["version"], # Optional metadata (for debugging) "metadata": { "instance": data,