Merge branch 'hotfix/nuke-publish-fixes'

Author: jakubjezek001

avalon/nuke/lib.py

@@ -88,20 +88,27 @@ def set_avalon_knob_data(node, data={}, prefix="ak:"):
             'subset': 'subsetMain'
         }
     """
+    # fix prefix back compatibility
+    if not isinstance(prefix, list):
+        prefix = [prefix]
+
+    # definition of knobs
     knobs = [
         {"name": 'AvalonTab', "value": '', "type": "Tab_Knob"},
         {"name": 'begin', "value": 'Avalon data group',
          "type": "Tab_Knob", "group": 2},
         {"name": '__divider__'},
         {"name": 'avalon_data',
          "value": 'Warning! Do not change following data!',
-         "type": "Text_Knob"}
+         "type": "Text_Knob"},
+        {"name": 'end', "value": 'Avalon data group',
+            "type": "Tab_Knob", "group": -1}
     ]
     visible = ["asset", "subset", "name", "namespace"]
 
     try:
         # create Avalon Tab and basic knobs
-        for k in knobs:
+        for k in knobs[:-1]:
             if k["name"] in node.knobs().keys():
                 continue
 
@@ -118,7 +125,7 @@ def set_avalon_knob_data(node, data={}, prefix="ak:"):
                 try:
                     knob.setValue(k['value'])
                 except TypeError as E:
-                    print(E)
+                    log.info("{} - Not correct knob value. Error: `{}`".format(__name__, E))
             else:
                 if k["name"] not in node.knobs().keys():
                     n_knob = getattr(nuke, k["type"])
@@ -127,7 +134,7 @@ def set_avalon_knob_data(node, data={}, prefix="ak:"):
 
         # add avalon knobs for imprinting data
         for key, value in data.items():
-            name = prefix + key
+            name = prefix[-1] + key
             value = str(value)
 
             try:
@@ -140,6 +147,13 @@ def set_avalon_knob_data(node, data={}, prefix="ak:"):
                 knob = n_knob(name, key, value)
                 node.addKnob(knob)
 
+        # adding closing group knob
+        cgk = knobs[-1]
+        if cgk["name"] not in node.knobs().keys():
+            n_knob = getattr(nuke, cgk["type"])
+            knob = n_knob(cgk["name"], cgk["value"], cgk.get("group"))
+            node.addKnob(knob)
+
         return node
 
     except NameError as e:
@@ -159,9 +173,10 @@ def get_avalon_knob_data(node, prefix="ak:"):
     """
     # check if lists
     if not isinstance(prefix, list):
-        prefix = list(prefix)
+        prefix = list([prefix])
 
     data = dict()
+    log.debug("___> prefix: `{}`".format(prefix))
     # loop prefix
     for p in prefix:
 
@@ -176,9 +191,9 @@ def get_avalon_knob_data(node, prefix="ak:"):
             return get_avalon_knob_data(node)
 
         # get data from filtered knobs
-        data.update({k.replace(prefix, ''): node[k].value()
+        data.update({k.replace(p, ''): node[k].value()
                     for k in node.knobs().keys()
-                    if prefix in k})
+                    if p in k})
 
     return data
 

avalon/nuke/pipeline.py

@@ -3,6 +3,8 @@
 import contextlib
 import importlib
 from collections import OrderedDict
+from __builtin__ import reload
+
 from pyblish import api as pyblish
 from ..pipeline import AVALON_CONTAINER_ID
 from .. import api, io, schema
@@ -21,8 +23,6 @@ def reload_pipeline():
 
     """
 
-    import importlib
-
     api.uninstall()
     _uninstall_menu()
 
@@ -40,7 +40,12 @@ def reload_pipeline():
         log.info("Reloading module: {}...".format(module))
 
         module = importlib.import_module(module)
-        importlib.reload(module)
+
+        try:
+            importlib.reload(module)
+        except AttributeError as e:
+            log.warning("Cannot reload module: {}".format(e))
+            reload(module)
 
     import avalon.nuke
     api.install(avalon.nuke)
@@ -104,7 +109,7 @@ def parse_container(node, validate=True):
     """
     data = lib.get_avalon_knob_data(node)
 
-    if validate:
+    if validate and data and data.get("schema"):
         schema.validate(data)
 
     if not isinstance(data, dict):

avalon/tools/creator/app.py

@@ -116,6 +116,7 @@ def _set_status_color(self, color):
 class Window(QtWidgets.QDialog):
 
     stateChanged = QtCore.Signal(bool)
+    taskSubsetFamilies = ["render"]
 
     def __init__(self, parent=None):
         super(Window, self).__init__(parent)
@@ -300,8 +301,14 @@ def _on_data_changed(self):
         if asset:
             # Get plugin and family
             plugin = item.data(PluginRole)
+            task = io.Session.get('AVALON_TASK', None)
+            sanitized_task = re.sub('[^0-9a-zA-Z]+', '_', task)
             family = plugin.family.rsplit(".", 1)[-1]
 
+            if family in self.taskSubsetFamilies:
+                task = io.Session.get('AVALON_TASK', '')
+                sanitized_task = re.sub('[^0-9a-zA-Z]+', '', task)
+
             # Get all subsets of the current asset
             subsets = io.find(filter={"type": "subset",
                                       "name": {"$regex": "{}*".format(family),
@@ -326,7 +333,18 @@ def _on_data_changed(self):
             # Update the result
             if subset_name:
                 subset_name = subset_name[0].upper() + subset_name[1:]
-            result.setText("{}{}".format(family, subset_name))
+
+            if family in self.taskSubsetFamilies:
+                result.setText("{}{}{}".format(
+                    family,
+                    sanitized_task.capitalize(),
+                    subset_name
+                ))
+            else:
+                result.setText("{}{}".format(
+                    family,
+                    subset_name.capitalize()
+                ))
 
             # Indicate subset existence
             if not subset_name: