Bug fix:

* Parse knob names that has dots in the name.
Changes:
* Add spinning wheel when loading nk (nkview) and add icon.

Author: maxWiklund

docs/parser.md

@@ -12,13 +12,11 @@ root = parseNk("../test_scenes/nested_group.nk")
 # iterate over all nodes.
 for node in root.allNodes():
     ...
-# Important note.
-# `node.name()` Will not return the file path but rather the name of the node (Root).
-root.name()
-# out: "Root"
 
-root.knob("name")
-# out: "/path/to/nested_group.nk"
+# Get knob values
+print(root.knob("first_frame"))
+# out: 1001
+
 
 ```
 

nkview/nuke_parser/nkview/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"

nkview/nuke_parser/nkview/graph_view.py

@@ -19,6 +19,7 @@
 from nuke_parser.nkview.gui_nodes import GroupNode, GuiNode
 from nuke_parser.nkview.navbar import NavigationBar
 from nuke_parser.nkview.qt import QtCore, QtGui, QtWidgets
+from nuke_parser.nkview.utils import qt_cursor
 from nuke_parser.parser import parseNk
 
 INT_MIN = -21474836
@@ -182,6 +183,7 @@ def frameSelected(self) -> None:
 
         self.fitInView(box, QtCore.Qt.KeepAspectRatio)
 
+    @qt_cursor
     def loadNk(self, file_path: str) -> None:
         """Load nuke script in graph view.
 

nkview/nuke_parser/nkview/gui_nodes.py

@@ -349,7 +349,7 @@ def paint(
         painter.drawText(
             name_rect,
             QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter,
-            self.nk_node.name(),
+            self.nk_node.nodeName(),
         )
 
         font = QtGui.QFont()
@@ -506,7 +506,7 @@ def getScene(self) -> QtWidgets.QGraphicsScene:
 
     def name(self) -> str:
         """Get node name."""
-        return self.nk_node.name()
+        return self.nk_node.nodeName()
 
 
 GuiNode = Union[DagNode, BackdropNode, StickyNoteNode]

nkview/nuke_parser/nkview/icons/nuke_types/ColorCorrect.png

@@ -45,7 +45,7 @@ def data(self, role: int = ...) -> Any:
 
         """
         if role == QtCore.Qt.ItemDataRole.DisplayRole:
-            return self.node.name()
+            return self.node.nodeName()
         elif role == NodePathRole:
             return self.node.path()
         elif role == NodeClassRole:

nkview/nuke_parser/nkview/outliner.py

@@ -11,11 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
+
 import copy
 import json
 import logging
 import os
-from typing import List
+from typing import Any, Callable, List
+
+from nuke_parser.nkview.qt import QtCore, QtWidgets
 
 LOG = logging.getLogger(__name__)
 
@@ -61,3 +65,34 @@ def recentlyOpened() -> List[str]:
         return []
     with open(_NKVIEW_SETTINGS, "r") as f:
         return copy.deepcopy(json.load(f).get("recently_opened", []))
+
+
+class WaitCursorContext(object):
+    """Qt working cursor context."""
+
+    def __enter__(self) -> WaitCursorContext:
+        """Start Working cursor."""
+        QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """Restore cursor."""
+        QtWidgets.QApplication.restoreOverrideCursor()
+
+
+def qt_cursor(func: Callable[[Any], Any]) -> Callable[[Any], Any]:
+    """Decorator to add Qt cursor wheel on function call.
+
+    Args:
+        func: Function to decorate.
+
+    Returns:
+        Wrapper function.
+
+    """
+    # pylint: disable=missing-return-doc
+    def wrapper(*args, **kwargs) -> Any:
+        with WaitCursorContext():
+            return func(*args, **kwargs)
+
+    return wrapper

nkview/nuke_parser/nkview/utils.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 __import__("pkg_resources").declare_namespace(__name__)
-__version__ = "0.1.0"
+__version__ = "0.1.1"

parser/nuke_parser/__init__.py

@@ -32,7 +32,7 @@
 _PUSH_RE = re.compile(r"push \$(?P<key>\w+)")
 _VERSION_RE = re.compile(r"version[ ]+(?P<version>[\d\.]+([ ]v\d)?)")
 _CLONE_RE = re.compile(r"clone \$(?P<key>\w+)\s\{")
-_NODE_KNOB_RE = re.compile(r"^\s*(?P<key>[\w_]+)[ ]+(?P<value>(:?\"|\w|\{|-|/).*)")
+_NODE_KNOB_RE = re.compile(r"^\s*(?P<key>[\w_\.]+)[ ]+(?P<value>(:?\"|\w|\{|-|/).*)")
 
 
 class Node:
@@ -94,6 +94,10 @@ def name(self) -> str:
             Node name.
 
         """
+        return self._knobs.get("name", "")
+
+    def nodeName(self) -> str:
+        """Name of node. Used in gui."""
         return self._knobs.get("name", "") if self.Class() != "Root" else "Root"
 
     def fullName(self) -> str:
@@ -257,7 +261,7 @@ def path(self) -> str:
         path = ""
         while node:
             # The name of Root is the file path. We don't want that.
-            name = node.name() if node.Class() != "Root" else "Root"
+            name = node.nodeName()
             path = "/" + name + path
             node = node.parent()
         return path + self._clone_suffix

parser/nuke_parser/parser.py

@@ -189,4 +189,14 @@ Merge2 {
  name Merge1
  xpos -587
  ypos -62
+}
+ColorCorrect {
+inputs 0
+saturation 0.9
+gamma {1.58 1.18 1.18 1.18}
+gain {4.9 2.9 2 2.9}
+shadows.gamma 1.02
+midtones.gamma 1.44
+midtones.gain {0.8999999762 0.6299999952 0.25 1}
+name ColorCorrect20
 }