Nuke: Multiple format supports for ExtractReviewDataMov

openpype/hosts/nuke/api/lib.py

@@ -3423,3 +3423,60 @@ def create_viewer_profile_string(viewer, display=None, path_like=False):
     if path_like:
         return "{}/{}".format(display, viewer)
     return "{} ({})".format(viewer, display)
+
+
+def get_head_filename_without_hashes(original_path, name):
+    """Function to get the renamed head filename without frame hashes
+    To avoid the system being confused on finding the filename with
+    frame hashes if the head of the filename has the hashed symbol
+
+    Args:
+        original_path (str): the filename with frame hashes
+        e.g. "renderCompositingMain.####.exr"
+        name (str): the name of the tags
+        e.g. "baking"
+
+    Returns:
+        filename: the renamed filename with the tag
+        e.g. "renderCompositingMain.baking.####.exr"
+    """
+    filename = os.path.basename(original_path)
+    fhead = os.path.splitext(filename)[0].strip(".")
+    if "#" in fhead:
+        fhead = re.sub("#+", "", fhead).rstrip(".")
+    elif "%" in fhead:
+        # use regex to convert %04d to {:0>4}
+        padding = re.search("%(\\d)+d", fhead)
+        padding = padding.group(1) if padding else 1
+        fhead = re.sub(
+            "%.*d",
+            "{{:0>{}}}".format(padding),
+            fhead
+        ).rstip(".")
+    new_fhead = "{}.{}".format(fhead, name)
+    filename = filename.replace(fhead, new_fhead)
+    return filename
+
+
+def get_filenames_without_hash(filename, frame_start, frame_end):
+    """Get filenames without frame hash
+        i.e. "renderCompositingMain.baking.0001.exr"
+
+    Args:
+        filename (str): filename with frame hash
+        frame_start (str): start of the frame
+        frame_end (str): end of the frame
+
+    Returns:
+        filenames(list): list of filename
+    """
+    filenames = []
+    for frame in range(int(frame_start), (int(frame_end) + 1)):
+        if "#" in filename:
+            # use regex to convert #### to {:0>4}
+            def replace(match):
+                return "{{:0>{}}}".format(len(match.group()))
+            filename_without_hashes = re.sub("#+", replace, filename)
+            new_filename = filename_without_hashes.format(frame)
+            filenames.append(new_filename)
+    return filenames

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,
@@ -35,7 +38,9 @@
     get_node_data,
     get_view_process_node,
     get_viewer_config_from_string,
-    deprecated
+    deprecated,
+    get_head_filename_without_hashes,
+    get_filenames_without_hash
 )
 from .pipeline import (
     list_instances,
@@ -634,6 +639,10 @@ def get_representation_data(
                 "frameStart": self.first_frame,
                 "frameEnd": self.last_frame,
             })
+        if ".{}".format(self.ext) not in VIDEO_EXTENSIONS:
+            filenames = get_filenames_without_hash(
+                self.file, self.first_frame, self.last_frame)
+            repre["files"] = filenames
 
         if self.multiple_presets:
             repre["outputName"] = self.name
@@ -808,6 +817,14 @@ 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 = get_head_filename_without_hashes(
+                self.path_in, self.name)
+            self.file = filename
+            if ".{}".format(self.ext) not in self.file:
+                original_ext = os.path.splitext(filename)[-1].strip(".")    # noqa
+                self.file = filename.replace(original_ext, ext)
+
         self.path = os.path.join(
             self.staging_dir, self.file).replace("\\", "/")
 
@@ -933,7 +950,6 @@ 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))
-
         # 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,22 @@ 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 deprecated ExtractReviewDataMov Plugins
+        """
+        nuke_publish = project_settings["nuke"]["publish"]
+        deprecated_setting = nuke_publish["ExtractReviewDataMov"]
+        current_setting = nuke_publish["ExtractReviewDataBakingStreams"]
+        if not deprecated_setting["enabled"]:
+            if current_setting["enabled"]:
+                cls.viewer_lut_raw = current_setting["viewer_lut_raw"]
+                cls.outputs = current_setting["outputs"]
+        else:
+            cls.viewer_lut_raw = deprecated_setting["viewer_lut_raw"]
+            cls.outputs = deprecated_setting["outputs"]
+
     def process(self, instance):
         families = set(instance.data["families"])
 

openpype/settings/ayon_settings.py

@@ -748,7 +748,19 @@ 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 not deprecrated_review_settings["enabled"]:
+        if current_review_settings["enabled"]:
+            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 +779,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": {