From 3e4c0cb47ea44dc568019a977417086e72168ce7 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Fri, 14 Apr 2023 20:49:32 +0800
Subject: [PATCH] add vray collector

---
 .../houdini/plugins/create/create_vray_rop.py |  5 +-
 .../plugins/publish/collect_redshift_rop.py   |  2 +-
 .../plugins/publish/collect_vray_rop.py       | 56 +++++++++++--------
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/openpype/hosts/houdini/plugins/create/create_vray_rop.py b/openpype/hosts/houdini/plugins/create/create_vray_rop.py
index cd80ad2d93..bb2d025cde 100644
--- a/openpype/hosts/houdini/plugins/create/create_vray_rop.py
+++ b/openpype/hosts/houdini/plugins/create/create_vray_rop.py
@@ -64,8 +64,8 @@ class CreateVrayROP(plugin.HoudiniCreator):
 
         # Enable render element
         ext = pre_create_data.get("image_format")
-        has_re = pre_create_data.get("render_element_enabled")
-        if has_re:
+        instance_data["RenderElement"] = pre_create_data.get("render_element_enabled")         # noqa
+        if pre_create_data.get("render_element_enabled", True):
             # Vray has its own tag for AOV file output
             filepath = "{}{}".format(
                 hou.text.expandString("$HIP/pyblish/"),
@@ -82,6 +82,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
             re_path = re_rop.path()
             parms.update({
                 "use_render_channels": 1,
+                "SettingsOutput_img_file_path": filepath,
                 "render_network_render_channels": re_path
             })
 
diff --git a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py b/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
index 15df12e075..ac55a01209 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
@@ -88,7 +88,7 @@ class CollectRedshiftROPRenderProducts(pyblish.api.InstancePlugin):
         )
         render_products.append(beauty_product)
         files_by_aov = {
-            "beauty": self.generate_expected_files(instance,
+            "_": self.generate_expected_files(instance,
                                                    beauty_product)}
 
         num_aovs = rop.evalParm("RS_aov")
diff --git a/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py b/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
index 90a6f10585..f246de6e53 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
@@ -78,15 +78,21 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
             instance.data["chunkSize"] = chunk_size
             self.log.debug("Chunk Size: %s" % chunk_size)
 
-        beauty_product = evalParmNoFrame(rop, "SettingsOutput_img_file_path")
+        default_prefix = evalParmNoFrame(rop, "SettingsOutput_img_file_path")
         render_products = []
-        # Default beauty AOV
+        # TODO: add render elements if render element
+
+        beauty_product = self.get_beauty_render_product(default_prefix)
         render_products.append(beauty_product)
         files_by_aov = {
-            "RGB Color":  self.generate_expected_files(instance,
-                                                       beauty_product)
-        }
-        # TODO: add render elements if render element
+                "RGB Color": self.generate_expected_files(instance,
+                                                          beauty_product)
+            }
+        render_element, aov = self.get_render_element_name(rop, default_prefix)
+        if render_element is not None:
+            render_products.append(render_element)
+            files_by_aov[aov] = self.generate_expected_files(instance,
+                                                             render_element)
 
         for product in render_products:
             self.log.debug("Found render product: %s" % product)
@@ -103,25 +109,31 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
         instance.data["expectedFiles"].append(files_by_aov)
         self.log.debug("expectedFiles:{}".format(files_by_aov))
 
-    def get_render_element_name(self, prefix, suffix="AOV"):
+    def get_beauty_render_product(self, prefix, suffix="<reName>"):
+        """Return the beauty output filename if render element enabled
+        """
+        aov_parm = ".{}".format(suffix)
+        beauty_product = None
+        if aov_parm in prefix:
+            beauty_product = prefix.replace(aov_parm, "")
+        else:
+            beauty_product = prefix
+
+        return beauty_product
+
+    def get_render_element_name(self, node, prefix, suffix="<reName>"):
         """Return the output filename using the AOV prefix and suffix
         """
         # need a rewrite
-        basename = os.path.basename(prefix)
-        filename, ext = os.path.splitext(basename)
-        aov_parm = "${%s}" % suffix
-        # prefix = ${HIP}/render/${HIPNAME}.${AOV}.$F4.exr
-        prefix = prefix.replace(filename.split("."),
-                                filename.split(".") +
-                                aov_parm)
-        # find the render element names
-        """
-        children = hou.node("renderelement node").children()
-        for c in children:
-            print c # all the aov names
-            add into aov_list except "channelsContainer"
-            if c only has channelsContainer please dont do anything
-        """
+        re_path = node.evalParm("render_network_render_channels")
+        node_children = hou.node(re_path).children()
+        for element in node_children:
+            if element != "channelsContainer":
+                render_product = prefix.replace(suffix, str(element))
+            else:
+                self.log.debug("skipping non render element output..")
+                continue
+            return render_product, str(element)
 
     def generate_expected_files(self, instance, path):
         """Create expected files in instance data"""