nuke master merge fixes

Author: iLLiCiTiT

avalon/nuke/__init__.py

@@ -6,6 +6,7 @@
 
 from .lib import (
     add_publish_knob,
+    ls_img_sequence,
     maintained_selection,
     get_node_path,
     get_avalon_knob_data,
@@ -51,13 +52,6 @@
 
     "Creator",
 
-    "file_extensions",
-    "has_unsaved_changes",
-    "save_file",
-    "open_file",
-    "current_file",
-    "work_root",
-
     "containerise",
     "parse_container",
     "update_container",
@@ -70,8 +64,17 @@
     "get_avalon_knob_data",
     "set_avalon_knob_data",
     "add_publish_knob",
+    "ls_img_sequence",
     "maintained_selection",
     "get_node_path",
+
+    # Workfiles API
+    "open_file",
+    "save_file",
+    "current_file",
+    "has_unsaved_changes",
+    "file_extensions",
+    "work_root"
 ]
 
 # Backwards API compatibility

avalon/nuke/lib.py

@@ -47,8 +47,6 @@ def reset_selection():
     """
     clear_selection_recursive()
 
-    Parse user data into Node knobs.
-    Use `collections.OrderedDict` to ensure knob order.
 
 def select_nodes(nodes):
     """Selects all inputed nodes
@@ -82,46 +80,6 @@ def add_publish_knob(node):
         node.addKnob(knob)
     return node
 
-    Returns:
-        None
-
-    Examples:
-        ```
-        import nuke
-        from avalon.nuke import lib
-
-        node = nuke.createNode("NoOp")
-        data = {
-            # Regular type of attributes
-            "myList": ["x", "y", "z"],
-            "myBool": True,
-            "myFloat": 0.1,
-            "myInt": 5,
-
-            # Creating non-default imprint type of knob
-            "MyFilePath": lib.Knobby("File_Knob", "/file/path"),
-            "divider": lib.Knobby("Text_Knob", ""),
-
-            # Manual nice knob naming
-            ("my_knob", "Nice Knob Name"): "some text",
-
-            # dict type will be created as knob group
-            "KnobGroup": {
-                "knob1": 5,
-                "knob2": "hello",
-                "knob3": ["a", "b"],
-            },
-
-            # Nested dict will be created as tab group
-            "TabGroup": {
-                "tab1": {"count": 5},
-                "tab2": {"isGood": True},
-                "tab3": {"direction": ["Left", "Right"]},
-            },
-        }
-        lib.imprint(node, data, tab="Demo")
-
-        ```
 
 def set_avalon_knob_data(node, data={}, prefix="ak:"):
     """ Sets a data into nodes's avalon knob
@@ -268,13 +226,9 @@ def check_subsetname_exists(nodes, subset_name):
     return result
 
 
-class Knobby(object):
-    """For creating knob which it's type isn't mapped in `create_knobs`
-
-    Args:
-        type (string): Nuke knob type name
-        value: Value to be set with `Knob.setValue`, put `None` if not required
-        *args: Args other than knob name for initializing knob class
+def imprint(node, data):
+    """Adding `Avalon data` into a node's Avalon Tab/Avalon knob
+    also including publish knob
 
     Arguments:
         node (obj): A nuke's node object
@@ -330,24 +284,6 @@ def ls_img_sequence(path):
         return False
 
 
-def get_avalon_knob_data(node, prefix="avalon:"):
-    """ Get data from nodes's avalon knob
-
-    Arguments:
-        node (nuke.Node): Nuke node to search for data,
-        prefix (str, optional): filtering prefix
-
-    Returns:
-        data (dict)
-    """
-    data = {
-        knob[len(prefix):]: node[knob].value()
-        for knob in node.knobs().keys()
-        if knob.startswith(prefix)
-    }
-    return data
-
-
 def fix_data_for_node_create(data):
     """Fixing data to be used for nuke knobs
     """

avalon/nuke/pipeline.py

@@ -13,9 +13,6 @@
 
 log = logging.getLogger(__name__)
 
-self = sys.modules[__name__]
-self._parent = None  # Main Window cache
-
 AVALON_CONFIG = os.environ["AVALON_CONFIG"]
 
 
@@ -79,18 +76,6 @@ def containerise(node,
         node (obj): containerised nuke's node object
 
     """
-    data = OrderedDict(
-        [
-            ("schema", "avalon-core:container-2.0"),
-            ("id", AVALON_CONTAINER_ID),
-            ("name", name),
-            ("namespace", namespace),
-            ("loader", str(loader)),
-            ("representation", context["representation"]["_id"]),
-        ],
-
-        **data or dict()
-    )
 
     data_imprint = OrderedDict({
         "schema": "avalon-core:container-2.0",
@@ -141,30 +126,34 @@ def parse_container(node, validate=True):
 
     # Store the node's name
     container["objectName"] = node["name"].value()
+
     # Store reference to the node object
     container["_node"] = node
 
     return container
 
 
-def update_container(node, keys=None):
+def update_container(node, keys=dict()):
     """Returns node with updateted containder data
 
     Arguments:
-        node (nuke.Node): The node in Nuke to imprint as container,
-        keys (dict, optional): data which should be updated
+        node (object): The node in Nuke to imprint as container,
+        keys (dict): data which should be updated
 
     Returns:
-        node (nuke.Node): nuke node with updated container data
+        node (object): nuke node with updated container data
+    """
 
     data = lib.get_avalon_knob_data(node)
 
     container = dict()
     container = {key: data[key] for key in data}
 
-    container = parse_container(node)
-    if not container:
-        raise TypeError("Not a valid container node.")
+    for key, value in container.items():
+        try:
+            container[key] = keys[key]
+        except KeyError:
+            pass
 
     node = lib.set_avalon_knob_data(node, container)
 
@@ -283,18 +272,6 @@ def find_host_config(config):
     return config
 
 
-def get_main_window():
-    """Acquire Nuke's main window"""
-    if self._parent is None:
-        top_widgets = QtWidgets.QApplication.topLevelWidgets()
-        name = "Foundry::UI::DockMainWindow"
-        main_window = next(widget for widget in top_widgets if
-                           widget.inherits("QMainWindow") and
-                           widget.metaObject().className() == name)
-        self._parent = main_window
-    return self._parent
-
-
 def uninstall(config):
     """Uninstall all that was previously installed
 
@@ -335,26 +312,13 @@ def _install_menu():
         api.Session["AVALON_ASSET"], api.Session["AVALON_TASK"]
     )
     context_menu = menu.addMenu(label)
-    context_menu.addCommand("Set Context",
-                            lambda: contextmanager.show(
-                                parent=get_main_window())
-                            )
-    menu.addSeparator()
-    menu.addCommand("Create...",
-                    lambda: creator.show(parent=get_main_window()))
-    menu.addCommand("Load...",
-                    lambda: loader.show(parent=get_main_window(),
-                                        use_context=True))
-    menu.addCommand("Publish...",
-                    lambda: publish.show(parent=get_main_window()))
-    menu.addCommand("Manage...",
-                    lambda: sceneinventory.show(parent=get_main_window()))
+    context_menu.addCommand("Set Context", contextmanager.show)
 
     menu.addSeparator()
     menu.addCommand("Work Files...",
                     lambda: workfiles.show(
-                        os.environ["AVALON_WORKDIR"],
-                        parent=get_main_window())
+                        os.environ["AVALON_WORKDIR"]
+                    )
                     )
     menu.addSeparator()
     menu.addCommand("Create...", creator.show)