Merged in hotfix/validate_ftrack_attributes (pull request #353)

Hotfix/validate ftrack attributes

Approved-by: Milan Kolar <milan@orbi.tools>

pype/nuke/lib.py

@@ -379,6 +379,10 @@ def add_rendering_knobs(node):
         knob = nuke.Boolean_Knob("render_farm", "Render on Farm")
         knob.setValue(False)
         node.addKnob(knob)
+    if "review" not in node.knobs():
+        knob = nuke.Boolean_Knob("review", "Review")
+        knob.setValue(True)
+        node.addKnob(knob)
     return node
 
 

pype/plugins/global/publish/validate_custom_ftrack_attributes.py

@@ -46,7 +46,8 @@ class ValidateFtrackAttributes(pyblish.api.InstancePlugin):
                         "Missing FTrack Task entity in context")
 
         host = pyblish.api.current_host()
-        to_check = context.data["presets"][host].get("ftrack_attributes")
+        to_check = context.data["presets"].get(
+            host, {}).get("ftrack_attributes")
         if not to_check:
             self.log.warning("ftrack_attributes preset not found")
             return

pype/plugins/nuke/load/load_sequence.py

@@ -110,6 +110,7 @@ class LoadSequence(api.Loader):
         last += self.handle_end
 
         file = self.fname.replace("\\", "/")
+
         log.info("file: {}\n".format(self.fname))
 
         repr_cont = context["representation"]["context"]
@@ -118,6 +119,11 @@ class LoadSequence(api.Loader):
                                         repr_cont["subset"],
                                         repr_cont["representation"])
 
+        if "#" not in file:
+            frame = repr_cont.get("frame")
+            padding = len(frame)
+            file = file.replace(frame, "#"*padding)
+
         # Create the Loader with the filename path set
         with viewer_update_and_undo_stop():
             # TODO: it might be universal read to img/geo/camera

pype/plugins/nuke/publish/collect_review.py

@@ -1,5 +1,5 @@
 import pyblish.api
-
+import nuke
 
 class CollectReview(pyblish.api.InstancePlugin):
     """Collect review instance from rendered frames
@@ -9,9 +9,20 @@ class CollectReview(pyblish.api.InstancePlugin):
     family = "review"
     label = "Collect Review"
     hosts = ["nuke"]
-    families = ["render", "render.local"]
+    families = ["render", "render.local", "render.farm"]
 
     def process(self, instance):
-        if instance.data["families"]:
+
-            instance.data["families"].append("review")
+        node = instance[0]
-            self.log.info("Review collected: `{}`".format(instance))
+
+        if "review" not in node.knobs():
+            knob = nuke.Boolean_Knob("review", "Review")
+            knob.setValue(True)
+            node.addKnob(knob)
+
+        if not node["review"].value():
+            return
+
+        instance.data["families"].append("review")
+        instance.data['families'].append('ftrack')
+        self.log.info("Review collected: `{}`".format(instance))

pype/plugins/nuke/publish/collect_writes.py

@@ -65,7 +65,6 @@ class CollectNukeWrites(pyblish.api.InstancePlugin):
         )
 
         if 'render' in instance.data['families']:
-            instance.data['families'].append('ftrack')
             if "representations" not in instance.data:
                 instance.data["representations"] = list()
 
@@ -78,15 +77,15 @@ class CollectNukeWrites(pyblish.api.InstancePlugin):
 
             try:
                 collected_frames = os.listdir(output_dir)
+                if collected_frames:
+                    representation['frameStart'] = "%0{}d".format(
+                        len(str(last_frame))) % first_frame
                 representation['files'] = collected_frames
                 instance.data["representations"].append(representation)
             except Exception:
                 instance.data["representations"].append(representation)
                 self.log.debug("couldn't collect frames: {}".format(label))
 
-        if 'render.local' in instance.data['families']:
-            instance.data['families'].append('ftrack')
-
         # Add version data to instance
         version_data = {
             "handles": handle_start,

pype/plugins/nuke/publish/extract_render_local.py

@@ -58,6 +58,7 @@ class NukeRenderLocal(pype.api.Extractor):
         repre = {
             'name': ext,
             'ext': ext,
+            'frameStart': "%0{}d".format(len(str(last_frame))) % first_frame,
             'files': collected_frames,
             "stagingDir": out_dir,
             "anatomy_template": "render"