Nuke: Multiple format supports for ExtractReviewDataMov

openpype/hosts/nuke/api/plugin.py

@@ -21,6 +21,9 @@
     CreatedInstance,
     get_current_task_name
 )
+from openpype.lib.transcoding import (
+    VIDEO_EXTENSIONS
+)
 from .lib import (
     INSTANCE_DATA_KNOB,
     Knobby,
@@ -801,6 +804,13 @@ def __init__(self,
         self.log.info("File info was set...")
 
         self.file = self.fhead + self.name + ".{}".format(self.ext)
+        if ".{}".format(self.ext) not in VIDEO_EXTENSIONS:
+            filename = os.path.basename(self.path_in)
+            self.file = filename
+            if ".{}".format(self.ext) not in self.file:
+                wrg_ext = filename.split(".")[-1]
+                self.file = filename.replace(wrg_ext, self.ext)
+
         self.path = os.path.join(
             self.staging_dir, self.file).replace("\\", "/")
 
@@ -921,7 +931,7 @@ def generate_mov(self, farm=False, **kwargs):
         self.log.debug("Path: {}".format(self.path))
         write_node["file"].setValue(str(self.path))
         write_node["file_type"].setValue(str(self.ext))
-
+        self.log.debug("{0}".format(self.ext))
         # Knobs `meta_codec` and `mov64_codec` are not available on centos.
         # TODO shouldn't this come from settings on outputs?
         try:

openpype/hosts/nuke/plugins/publish/extract_review_data_mov.py → openpype/hosts/nuke/plugins/publish/extract_review_baking_streams.py

@@ -8,15 +8,15 @@
 from openpype.hosts.nuke.api.lib import maintained_selection
 
 
-class ExtractReviewDataMov(publish.Extractor):
+class ExtractReviewDataBakingStreams(publish.Extractor):
     """Extracts movie and thumbnail with baked in luts
 
     must be run after extract_render_local.py
 
     """
 
     order = pyblish.api.ExtractorOrder + 0.01
-    label = "Extract Review Data Mov"
+    label = "Extract Review Data Baking Streams"
 
     families = ["review"]
     hosts = ["nuke"]
@@ -25,6 +25,34 @@ class ExtractReviewDataMov(publish.Extractor):
     viewer_lut_raw = None
     outputs = {}
 
+    @classmethod
+    def apply_settings(cls, project_settings):
+        """just in case there are some old presets
+        in deprecrated ExtractReviewDataMov Plugins
+        """
+        nuke_publish = project_settings["nuke"]["publish"]
+        deprecrated_review_settings = nuke_publish["ExtractReviewDataMov"]
+        current_review_settings = (
+            nuke_publish["ExtractReviewDataBakingStreams"]
+        )
+        if deprecrated_review_settings["viewer_lut_raw"] == (
+            current_review_settings["viewer_lut_raw"]
+        ):
+            cls.viewer_lut_raw = (
+                current_review_settings["viewer_lut_raw"]
+            )
+        else:
+            cls.viewer_lut_raw = (
+                deprecrated_review_settings["viewer_lut_raw"]
+            )
+
+        if deprecrated_review_settings["outputs"] == (
+            current_review_settings["outputs"]
+        ):
+            cls.outputs = current_review_settings["outputs"]
+        else:
+            cls.outputs = deprecrated_review_settings["outputs"]
+
     def process(self, instance):
         families = set(instance.data["families"])
 

openpype/settings/ayon_settings.py

@@ -748,7 +748,20 @@ def _convert_nuke_project_settings(ayon_settings, output):
     )
 
     new_review_data_outputs = {}
-    for item in ayon_publish["ExtractReviewDataMov"]["outputs"]:
+    outputs_settings = None
+    # just in case that the users having old presets in outputs setting
+    deprecrated_review_settings = ayon_publish["ExtractReviewDataMov"]
+    current_review_settings = (
+        ayon_publish["ExtractReviewDataBakingStreams"]
+    )
+    if deprecrated_review_settings["outputs"] == (
+        current_review_settings["outputs"]
+    ):
+        outputs_settings = current_review_settings["outputs"]
+    else:
+        outputs_settings = deprecrated_review_settings["outputs"]
+
+    for item in outputs_settings:
         item_filter = item["filter"]
         if "product_names" in item_filter:
             item_filter["subsets"] = item_filter.pop("product_names")
@@ -767,7 +780,13 @@ def _convert_nuke_project_settings(ayon_settings, output):
 
         name = item.pop("name")
         new_review_data_outputs[name] = item
-    ayon_publish["ExtractReviewDataMov"]["outputs"] = new_review_data_outputs
+
+    if deprecrated_review_settings["outputs"] == (
+        current_review_settings["outputs"]
+    ):
+        current_review_settings["outputs"] = new_review_data_outputs
+    else:
+        deprecrated_review_settings["outputs"] = new_review_data_outputs
 
     collect_instance_data = ayon_publish["CollectInstanceData"]
     if "sync_workfile_version_on_product_types" in collect_instance_data:

openpype/settings/defaults/project_settings/nuke.json

@@ -501,6 +501,60 @@
                 }
             }
         },
+        "ExtractReviewDataBakingStreams": {
+            "enabled": true,
+            "viewer_lut_raw": false,
+            "outputs": {
+                "baking": {
+                    "filter": {
+                        "task_types": [],
+                        "families": [],
+                        "subsets": []
+                    },
+                    "read_raw": false,
+                    "viewer_process_override": "",
+                    "bake_viewer_process": true,
+                    "bake_viewer_input_process": true,
+                    "reformat_nodes_config": {
+                        "enabled": false,
+                        "reposition_nodes": [
+                            {
+                                "node_class": "Reformat",
+                                "knobs": [
+                                    {
+                                        "type": "text",
+                                        "name": "type",
+                                        "value": "to format"
+                                    },
+                                    {
+                                        "type": "text",
+                                        "name": "format",
+                                        "value": "HD_1080"
+                                    },
+                                    {
+                                        "type": "text",
+                                        "name": "filter",
+                                        "value": "Lanczos6"
+                                    },
+                                    {
+                                        "type": "bool",
+                                        "name": "black_outside",
+                                        "value": true
+                                    },
+                                    {
+                                        "type": "bool",
+                                        "name": "pbb",
+                                        "value": false
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "extension": "mov",
+                    "add_custom_tags": []
+                }
+            }
+        },
         "ExtractSlateFrame": {
             "viewer_lut_raw": false,
             "key_value_mapping": {

openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json

@@ -371,6 +371,151 @@
 
             ]
         },
+        {
+            "type": "label",
+            "label": "^ Settings and for <span style=\"color:#FF0000\";><b>ExtractReviewDataMov</b></span> is deprecated and will be soon removed.  <br> Please use <b>ExtractReviewDataBakingStreams</b> instead."
+        },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "checkbox_key": "enabled",
+            "key": "ExtractReviewDataBakingStreams",
+            "label": "ExtractReviewDataBakingStreams",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "boolean",
+                    "key": "viewer_lut_raw",
+                    "label": "Viewer LUT raw"
+                },
+                {
+                    "key": "outputs",
+                    "label": "Output Definitions",
+                    "type": "dict-modifiable",
+                    "highlight_content": true,
+                    "object_type": {
+                        "type": "dict",
+                        "children": [
+                            {
+                                "type": "dict",
+                                "collapsible": false,
+                                "key": "filter",
+                                "label": "Filtering",
+                                "children": [
+                                    {
+                                        "key": "task_types",
+                                        "label": "Task types",
+                                        "type": "task-types-enum"
+                                    },
+                                    {
+                                        "key": "families",
+                                        "label": "Families",
+                                        "type": "list",
+                                        "object_type": "text"
+                                    },
+                                    {
+                                        "key": "subsets",
+                                        "label": "Subsets",
+                                        "type": "list",
+                                        "object_type": "text"
+                                    }
+                                ]
+                            },
+                            {
+                                "type": "separator"
+                            },
+                            {
+                                "type": "boolean",
+                                "key": "read_raw",
+                                "label": "Read colorspace RAW",
+                                "default": false
+                            },
+                            {
+                                "type": "text",
+                                "key": "viewer_process_override",
+                                "label": "Viewer Process colorspace profile override"
+                            },
+                            {
+                                "type": "boolean",
+                                "key": "bake_viewer_process",
+                                "label": "Bake Viewer Process"
+                            },
+                            {
+                                "type": "boolean",
+                                "key": "bake_viewer_input_process",
+                                "label": "Bake Viewer Input Process (LUTs)"
+                            },
+                            {
+                                "type": "separator"
+                            },
+                            {
+                                "key": "reformat_nodes_config",
+                                "type": "dict",
+                                "label": "Reformat Nodes",
+                                "collapsible": true,
+                                "checkbox_key": "enabled",
+                                "children": [
+                                    {
+                                        "type": "boolean",
+                                        "key": "enabled",
+                                        "label": "Enabled"
+                                    },
+                                    {
+                                        "type": "label",
+                                        "label": "Reposition knobs supported only.<br/>You can add multiple reformat nodes <br/>and set their knobs. Order of reformat <br/>nodes is important. First reformat node <br/>will be applied first and last reformat <br/>node will be applied last."
+                                    },
+                                    {
+                                        "key": "reposition_nodes",
+                                        "type": "list",
+                                        "label": "Reposition nodes",
+                                        "object_type": {
+                                            "type": "dict",
+                                            "children": [
+                                                {
+                                                    "key": "node_class",
+                                                    "label": "Node class",
+                                                    "type": "text"
+                                                },
+                                                {
+                                                    "type": "schema_template",
+                                                    "name": "template_nuke_knob_inputs",
+                                                    "template_data": [
+                                                        {
+                                                            "label": "Node knobs",
+                                                            "key": "knobs"
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    }
+                                ]
+                            },
+                            {
+                                "type": "separator"
+                            },
+                            {
+                                "type": "text",
+                                "key": "extension",
+                                "label": "Write node file type"
+                            },
+                            {
+                                "key": "add_custom_tags",
+                                "label": "Add custom tags",
+                                "type": "list",
+                                "object_type": "text"
+                            }
+                        ]
+                    }
+                }
+
+            ]
+        },
         {
             "type": "dict",
             "collapsible": true,