From fa11a2bfdcddb6b085641f1c3c078ee34c5405aa Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 5 Oct 2023 19:17:25 +0800
Subject: [PATCH] small tweaks on loader and extractor & use raise
 PublishValidationError for each instead of using reports append list of
 error.

---
 openpype/hosts/max/plugins/load/load_tycache.py  |  3 +--
 .../hosts/max/plugins/publish/extract_tycache.py | 13 ++++++-------
 .../max/plugins/publish/validate_tyflow_data.py  | 16 ++++++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/openpype/hosts/max/plugins/load/load_tycache.py b/openpype/hosts/max/plugins/load/load_tycache.py
index 657e743087..7eac0de3e5 100644
--- a/openpype/hosts/max/plugins/load/load_tycache.py
+++ b/openpype/hosts/max/plugins/load/load_tycache.py
@@ -49,8 +49,7 @@ class PointCloudLoader(load.LoaderPlugin):
         update_custom_attribute_data(
             node, node_list)
         with maintained_selection():
-            rt.Select(node_list)
-            for prt in rt.Selection:
+            for prt in node_list:
                 prt.filename = path
         lib.imprint(container["instance_node"], {
             "representation": str(representation["_id"])
diff --git a/openpype/hosts/max/plugins/publish/extract_tycache.py b/openpype/hosts/max/plugins/publish/extract_tycache.py
index 56fd39406e..0327564b3a 100644
--- a/openpype/hosts/max/plugins/publish/extract_tycache.py
+++ b/openpype/hosts/max/plugins/publish/extract_tycache.py
@@ -42,18 +42,17 @@ class ExtractTyCache(publish.Extractor):
 
         with maintained_selection():
             job_args = None
+            has_tyc_spline = (
+                True
+                if instance.data["tycache_type"] == "tycachespline"
+                else False
+            )
             if instance.data["tycache_type"] == "tycache":
-                job_args = self.export_particle(
-                    instance.data["members"],
-                    start, end, path,
-                    additional_attributes)
-            elif instance.data["tycache_type"] == "tycachespline":
                 job_args = self.export_particle(
                     instance.data["members"],
                     start, end, path,
                     additional_attributes,
-                    tycache_spline_enabled=True)
-
+                    tycache_spline_enabled=has_tyc_spline)
             for job in job_args:
                 rt.Execute(job)
 
diff --git a/openpype/hosts/max/plugins/publish/validate_tyflow_data.py b/openpype/hosts/max/plugins/publish/validate_tyflow_data.py
index c0a6d23022..59dafef901 100644
--- a/openpype/hosts/max/plugins/publish/validate_tyflow_data.py
+++ b/openpype/hosts/max/plugins/publish/validate_tyflow_data.py
@@ -23,15 +23,14 @@ class ValidateTyFlowData(pyblish.api.InstancePlugin):
 
         invalid_object = self.get_tyflow_object(instance)
         if invalid_object:
-            report.append(f"Non tyFlow object found: {invalid_object}")
+             raise PublishValidationError(
+                 f"Non tyFlow object found: {invalid_object}")
 
         invalid_operator = self.get_tyflow_operator(instance)
         if invalid_operator:
-            report.append((
+            raise PublishValidationError((
                 "tyFlow ExportParticle operator not "
                 f"found: {invalid_operator}"))
-        if report:
-            raise PublishValidationError(f"{report}")
 
     def get_tyflow_object(self, instance):
         """Get the nodes which are not tyFlow object(s)
@@ -46,7 +45,7 @@ class ValidateTyFlowData(pyblish.api.InstancePlugin):
         """
         invalid = []
         container = instance.data["instance_node"]
-        self.log.info(f"Validating tyFlow container for {container}")
+        self.log.debug(f"Validating tyFlow container for {container}")
 
         selection_list = instance.data["members"]
         for sel in selection_list:
@@ -61,7 +60,8 @@ class ValidateTyFlowData(pyblish.api.InstancePlugin):
         return invalid
 
     def get_tyflow_operator(self, instance):
-        """_summary_
+        """Check if the Export Particle Operators in the node
+        connections.
 
         Args:
             instance (str): instance node
@@ -73,7 +73,7 @@ class ValidateTyFlowData(pyblish.api.InstancePlugin):
         """
         invalid = []
         container = instance.data["instance_node"]
-        self.log.info(f"Validating tyFlow object for {container}")
+        self.log.debug(f"Validating tyFlow object for {container}")
         selection_list = instance.data["members"]
         bool_list = []
         for sel in selection_list:
@@ -88,7 +88,7 @@ class ValidateTyFlowData(pyblish.api.InstancePlugin):
             # if the export_particles property is not there
             # it means there is not a "Export Particle" operator
             if "True" not in bool_list:
-                self.log.error("Operator 'Export Particles' not found!")
+                self.log.error("Operator 'Export Particles' not found.")
                 invalid.append(sel)
 
         return invalid