From 3818b57bda704dce2a41f44e149c6e9bf228dba2 Mon Sep 17 00:00:00 2001 From: MustafaJafar Date: Mon, 2 Sep 2024 14:06:17 +0300 Subject: [PATCH] move functions defs to lib --- client/ayon_houdini/api/lib.py | 56 +++++++++++++++++++ .../plugins/load/load_filepath.py | 48 ++-------------- 2 files changed, 62 insertions(+), 42 deletions(-) diff --git a/client/ayon_houdini/api/lib.py b/client/ayon_houdini/api/lib.py index df0cb6c277..861e06ae24 100644 --- a/client/ayon_houdini/api/lib.py +++ b/client/ayon_houdini/api/lib.py @@ -1430,3 +1430,59 @@ def load_node_preset(target_node, node_preset, update_locked=False, log=None): if update_locked and parm_locked: param.lock(True) + + +def read_and_apply_preset(node, update_locked=False): + """Read and apply a node preset. + + This function expects the following parameters to be present on the node: + 1. filepath: Path to the preset file node. + 2. target_node: The node that will receive the preset settings. + + Args: + node(hou.Node): file path node + update_locked (bool, optional): if set, it will update locked parameters. + + Returns: + None + """ + + json_path = node.parm("filepath").eval() + target_node = node.parm("target_node").evalAsNode() + if target_node: + node_preset = {} + with open(json_path, "r") as f: + node_preset = json.load(f) + + load_node_preset(target_node, node_preset, update_locked=update_locked) + + +def node_preset_validate_target(node): + """Validates the type of the target node. + + This function provides visual confirmation when the target node's type + aligns with the type used to create the node preset. + + This function expects the following parameters to be present on the node: + 1. filepath: Path to the preset file node. + 2. target_node: The node that will receive the preset settings. + + """ + + json_path = node.parm("filepath").eval() + target_node = node.parm("target_node").evalAsNode() + node_preset = {} + with open(json_path, "r") as f: + node_preset = json.load(f) + + node_type = node_preset["metadata"]["type"] + + node.setColor(hou.Color(0.7, 0.8, 0.87)) + node.setComment("") + node.setGenericFlag(hou.nodeFlag.DisplayComment, True) + if target_node and target_node.type().name() != node_type: + node.setColor(hou.Color(0.8, 0.45, 0.1)) + node.setComment( + f"Target Node type '{target_node.type().name()}' doesn't match the loaded preset type '{node_type}'." + "Please note, Applying the preset skips parameters that doesn't exist" + ) \ No newline at end of file diff --git a/client/ayon_houdini/plugins/load/load_filepath.py b/client/ayon_houdini/plugins/load/load_filepath.py index d17c59fe0b..2b4fb636e7 100644 --- a/client/ayon_houdini/plugins/load/load_filepath.py +++ b/client/ayon_houdini/plugins/load/load_filepath.py @@ -170,26 +170,8 @@ def _add_more_node_params(self, attr_folder, node): tags= { "oprelative" : ".", "script_callback" : """ -import json -from ayon_houdini.api.lib import load_node_preset - -json_path = hou.parm("./filepath").eval() -target_node = hou.parm("./target_node").evalAsNode() -node_preset = {} -with open(json_path, "r") as f: - node_preset = json.load(f) - -node_type = node_preset["metadata"]["type"] - -hou.pwd().setColor(hou.Color(0.7, 0.8, 0.87)) -hou.pwd().setComment("") -hou.pwd().setGenericFlag(hou.nodeFlag.DisplayComment, True) -if target_node and target_node.type().name() != node_type: - hou.pwd().setColor(hou.Color(0.8, 0.45, 0.1)) - hou.pwd().setComment( - f"Target Node type '{target_node.type().name()}' doesn't match the loaded preset type '{node_type}'." - "Please note, Applying the preset skips parameters that doesn't exist" - ) +from ayon_houdini.api.lib import node_preset_validate_target +node_preset_validate_target(hou.pwd()) """, "script_callback_language" : "python", } @@ -200,17 +182,8 @@ def _add_more_node_params(self, attr_folder, node): label="Apply Preset", tags= { "script_callback" : """ -import json -from ayon_houdini.api.lib import load_node_preset - -json_path = hou.parm("./filepath").eval() -target_node = hou.parm("./target_node").evalAsNode() -if target_node: - node_preset = {} - with open(json_path, "r") as f: - node_preset = json.load(f) - - load_node_preset(target_node, node_preset) +from ayon_houdini.api.lib import read_and_apply_preset +read_and_apply_preset(hou.pwd()) """, "script_callback_language" : "python", }, @@ -223,17 +196,8 @@ def _add_more_node_params(self, attr_folder, node): label="Force Apply Preset", tags= { "script_callback" : """ -import json -from ayon_houdini.api.lib import load_node_preset - -json_path = hou.parm("./filepath").eval() -target_node = hou.parm("./target_node").evalAsNode() -if target_node: - node_preset = {} - with open(json_path, "r") as f: - node_preset = json.load(f) - - load_node_preset(target_node, node_preset, update_locked=True) +from ayon_houdini.api.lib import read_and_apply_preset +read_and_apply_preset(hou.pwd(), update_locked=True) """, "script_callback_language" : "python", },