wip json file assumed files

This commit is contained in:
Ondřej Samohel 2020-01-31 20:02:42 +01:00
parent 9326d4eb79
commit bcd8bd742d
No known key found for this signature in database
GPG key ID: 8A29C663C672C2B7
2 changed files with 47 additions and 12 deletions

View file

@ -72,9 +72,9 @@ def collect(root,
class CollectRenderedFrames(pyblish.api.ContextPlugin):
"""Gather file sequences from working directory
When "FILESEQUENCE" environment variable is set these paths (folders or
.json files) are parsed for image sequences. Otherwise the current
working directory is searched for file sequences.
When "PYPE_PUBLISH_PATHS" environment variable is set these paths
(folders or .json files) are parsed for image sequences.
Otherwise the current working directory is searched for file sequences.
The json configuration may have the optional keys:
asset (str): The asset to publish to. If not provided fall back to
@ -101,7 +101,6 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
lut_path = None
slate_frame = None
families_data = None
baked_mov_path = None
subset = None
version = None
frame_start = 0
@ -167,8 +166,6 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
families_data = instance.get("families")
slate_frame = instance.get("slateFrame")
version = instance.get("version")
else:
# Search in directory
data = dict()
@ -199,10 +196,6 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
fps = data.get("fps", 25)
# adding publish comment and intent to context
context.data["comment"] = data.get("comment", "")
context.data["intent"] = data.get("intent", "")
if data.get("user"):
context.data["user"] = data["user"]
@ -266,6 +259,8 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
"anatomy_template": "render",
"fps": fps,
"tags": ["review"],
"frameStart": frame_start,
"frameEnd": frame_end
}
instance.data["representations"].append(
representation)
@ -428,8 +423,6 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin):
"name": ext,
"ext": "{}".format(ext),
"files": list(collection),
"frameStart": start,
"frameEnd": end,
"stagingDir": root,
"anatomy_template": "render",
"fps": fps,

View file

@ -253,7 +253,49 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
:param instance: Instance data
:type instance: dict
Data needed for collect_filesequences:
root
asset *
source *
frameStart
frameEnd
subset
ftrack
fps
user
version *
attachTo *:
subset
version
regex !
exclude_regex !
metadata:
session *
instance *:
family
pixelAspect *
resolutionWidth
resolutionHeight
lutPath *
bakeRenderPath
families
slateFrame
version
representations:
name
ext
files": []]
frameStart
frameEnd
stagingDir
anatomy_template
fps
tags
"""
# Get a submission job
data = instance.data.copy()
render_job = data.pop("deadlineSubmissionJob", None)