From f35f4c1e93c4b7e64c13334036ccf3fdce1ed683 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 6 Nov 2019 01:14:09 +0100 Subject: [PATCH] feat(nuke): templates.py to presets.py - rename key `preset` to `families` - `families`: looping family as preset - omit tags for later clearing --- pype/nuke/lib.py | 4 +++- pype/nuke/{templates.py => presets.py} | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) rename pype/nuke/{templates.py => presets.py} (75%) diff --git a/pype/nuke/lib.py b/pype/nuke/lib.py index 00a264c669..2021e6bdd4 100644 --- a/pype/nuke/lib.py +++ b/pype/nuke/lib.py @@ -8,7 +8,9 @@ import avalon.nuke import pype.api as pype import nuke -from .templates import ( + + +from .presets import ( get_colorspace_preset, get_node_dataflow_preset, get_node_colorspace_preset diff --git a/pype/nuke/templates.py b/pype/nuke/presets.py similarity index 75% rename from pype/nuke/templates.py rename to pype/nuke/presets.py index 6434d73f1d..a3f62764c8 100644 --- a/pype/nuke/templates.py +++ b/pype/nuke/presets.py @@ -25,16 +25,22 @@ def get_node_dataflow_preset(**kwarg): log.info(kwarg) host = kwarg.get("host", "nuke") cls = kwarg.get("class", None) - preset = kwarg.get("preset", None) - assert any([host, cls]), log.error("nuke.templates.get_node_dataflow_preset(): \ - Missing mandatory kwargs `host`, `cls`") + families = kwarg.get("families", []) + preset = kwarg.get("preset", None) # omit < 2.0.0v + + assert any([host, cls]), log.error( + "`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__)) nuke_dataflow = get_dataflow_preset().get(str(host), None) nuke_dataflow_nodes = nuke_dataflow.get('nodes', 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) + # 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)) return nuke_dataflow_node @@ -47,8 +53,8 @@ def get_node_colorspace_preset(**kwarg): host = kwarg.get("host", "nuke") cls = kwarg.get("class", None) preset = kwarg.get("preset", None) - assert any([host, cls]), log.error("nuke.templates.get_node_colorspace_preset(): \ - Missing mandatory kwargs `host`, `cls`") + assert any([host, cls]), log.error( + "`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__)) nuke_colorspace = get_colorspace_preset().get(str(host), None) nuke_colorspace_node = nuke_colorspace.get(str(cls), None)