Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in hotfix/nuke-publish-fixes (pull request #358)

Browse source 
Nuke publising fixes related to avalon.nuke

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Jakub Ježek 2019-11-06 09:20:30 +00:00 • committed by Milan Kolar
commit 16463867a7
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pype/nuke/lib.py
View file

@ -8,7 +8,9 @@ import avalon.nuke
import pype.api as pype import pype.api as pype
import nuke import nuke
from .templates import (
from .presets import (
get_colorspace_preset, get_colorspace_preset,
get_node_dataflow_preset, get_node_dataflow_preset,
get_node_colorspace_preset get_node_colorspace_preset
@ -55,7 +57,8 @@ def checkInventoryVersions():
if container: if container:
node = container["_node"] node = container["_node"]
avalon_knob_data = avalon.nuke.get_avalon_knob_data(node) avalon_knob_data = avalon.nuke.get_avalon_knob_data(
node, ['avalon:', 'ak:'])
# get representation from io # get representation from io
representation = io.find_one({ representation = io.find_one({
@ -101,7 +104,8 @@ def writes_version_sync():
for each in nuke.allNodes(): for each in nuke.allNodes():
if each.Class() == 'Write': if each.Class() == 'Write':
avalon_knob_data = avalon.nuke.get_avalon_knob_data(each) avalon_knob_data = avalon.nuke.get_avalon_knob_data(
each, ['avalon:', 'ak:'])
try: try:
if avalon_knob_data['families'] not in ["render"]: if avalon_knob_data['families'] not in ["render"]:
@ -134,7 +138,8 @@ def get_render_path(node):
''' Generate Render path from presets regarding avalon knob data ''' Generate Render path from presets regarding avalon knob data
''' '''
data = dict() data = dict()
data['avalon'] = avalon.nuke.get_avalon_knob_data(node) data['avalon'] = avalon.nuke.get_avalon_knob_data(
node, ['avalon:', 'ak:'])
data_preset = { data_preset = {
"class": data['avalon']['family'], "class": data['avalon']['family'],
@ -827,10 +832,12 @@ def get_write_node_template_attr(node):
''' '''
# get avalon data from node # get avalon data from node
data = dict() data = dict()
data['avalon'] = avalon.nuke.get_avalon_knob_data(node) data['avalon'] = avalon.nuke.get_avalon_knob_data(
node, ['avalon:', 'ak:'])
data_preset = { data_preset = {
"class": data['avalon']['family'], "class": data['avalon']['family'],
"preset": data['avalon']['families'] "families": data['avalon']['families'],
"preset": data['avalon']['families'] # omit < 2.0.0v
} }
# get template data # get template data

18
pype/nuke/templates.py → pype/nuke/presets.py
View file

@ -25,16 +25,22 @@ def get_node_dataflow_preset(**kwarg):
log.info(kwarg) log.info(kwarg)
host = kwarg.get("host", "nuke") host = kwarg.get("host", "nuke")
cls = kwarg.get("class", None) cls = kwarg.get("class", None)
preset = kwarg.get("preset", None) families = kwarg.get("families", [])
assert any([host, cls]), log.error("nuke.templates.get_node_dataflow_preset(): \ preset = kwarg.get("preset", None) # omit < 2.0.0v
Missing mandatory kwargs `host`, `cls`")
assert any([host, cls]), log.error(
"`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__))
nuke_dataflow = get_dataflow_preset().get(str(host), None) nuke_dataflow = get_dataflow_preset().get(str(host), None)
nuke_dataflow_nodes = nuke_dataflow.get('nodes', None) nuke_dataflow_nodes = nuke_dataflow.get('nodes', None)
nuke_dataflow_node = nuke_dataflow_nodes.get(str(cls), None) nuke_dataflow_node = nuke_dataflow_nodes.get(str(cls), None)
if preset: if preset: # omit < 2.0.0v
nuke_dataflow_node = nuke_dataflow_node.get(str(preset), None) nuke_dataflow_node = nuke_dataflow_node.get(str(preset), None)
# omit < 2.0.0v
for family in families:
nuke_dataflow_node = nuke_dataflow_node.get(str(family), None)
log.info("Dataflow: {}".format(nuke_dataflow_node)) log.info("Dataflow: {}".format(nuke_dataflow_node))
return nuke_dataflow_node return nuke_dataflow_node
@ -47,8 +53,8 @@ def get_node_colorspace_preset(**kwarg):
host = kwarg.get("host", "nuke") host = kwarg.get("host", "nuke")
cls = kwarg.get("class", None) cls = kwarg.get("class", None)
preset = kwarg.get("preset", None) preset = kwarg.get("preset", None)
assert any([host, cls]), log.error("nuke.templates.get_node_colorspace_preset(): \ assert any([host, cls]), log.error(
Missing mandatory kwargs `host`, `cls`") "`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__))
nuke_colorspace = get_colorspace_preset().get(str(host), None) nuke_colorspace = get_colorspace_preset().get(str(host), None)
nuke_colorspace_node = nuke_colorspace.get(str(cls), None) nuke_colorspace_node = nuke_colorspace.get(str(cls), None)