Merge branch 'develop' into feature/OP-2637_Houdini-Farm-publishingrendering

openpype/hosts/houdini/plugins/publish/collect_frames.py

@@ -8,7 +8,6 @@ import pyblish.api
 from openpype.hosts.houdini.api import lib
 
 
-
 class CollectFrames(pyblish.api.InstancePlugin):
     """Collect all frames which would be saved from the ROP nodes"""
 
@@ -34,8 +33,10 @@ class CollectFrames(pyblish.api.InstancePlugin):
             self.log.warning("Using current frame: {}".format(hou.frame()))
             output = output_parm.eval()
 
-        _, ext = lib.splitext(output,
-                          allowed_multidot_extensions=[".ass.gz"])
+        _, ext = lib.splitext(
+            output,
+            allowed_multidot_extensions=[".ass.gz"]
+        )
         file_name = os.path.basename(output)
         result = file_name
 

openpype/hosts/houdini/plugins/publish/collect_inputs.py

@@ -117,4 +117,4 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin):
 
         inputs = [c["representation"] for c in containers]
         instance.data["inputRepresentations"] = inputs
-        self.log.info("Collected inputs: %s" % inputs)
+        self.log.debug("Collected inputs: %s" % inputs)

openpype/hosts/houdini/plugins/publish/collect_instances.py

@@ -55,7 +55,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
             has_family = node.evalParm("family")
             assert has_family, "'%s' is missing 'family'" % node.name()
 
-            self.log.info("processing {}".format(node))
+            self.log.info(
+                "Processing legacy instance node {}".format(node.path())
+            )
 
             data = lib.read(node)
             # Check bypass state and reverse

openpype/hosts/houdini/plugins/publish/collect_workfile.py

@@ -32,5 +32,4 @@ class CollectWorkfile(pyblish.api.InstancePlugin):
             "stagingDir": folder,
         }]
 
-        self.log.info('Collected instance: {}'.format(file))
-        self.log.info('staging Dir: {}'.format(folder))
+        self.log.debug('Collected workfile instance: {}'.format(file))

openpype/hosts/houdini/plugins/publish/save_scene.py

@@ -20,7 +20,7 @@ class SaveCurrentScene(pyblish.api.ContextPlugin):
         )
 
         if host.has_unsaved_changes():
-            self.log.info("Saving current file {}...".format(current_file))
+            self.log.info("Saving current file: {}".format(current_file))
             host.save_workfile(current_file)
         else:
             self.log.debug("No unsaved changes, skipping file save..")

openpype/hosts/houdini/plugins/publish/validate_workfile_paths.py

@@ -28,18 +28,37 @@ class ValidateWorkfilePaths(
         if not self.is_active(instance.data):
             return
         invalid = self.get_invalid()
-        self.log.info(
-            "node types to check: {}".format(", ".join(self.node_types)))
-        self.log.info(
-            "prohibited vars: {}".format(", ".join(self.prohibited_vars))
+        self.log.debug(
+            "Checking node types: {}".format(", ".join(self.node_types)))
+        self.log.debug(
+            "Searching prohibited vars: {}".format(
+                ", ".join(self.prohibited_vars)
+            )
         )
-        if invalid:
-            for param in invalid:
-                self.log.error(
-                    "{}: {}".format(param.path(), param.unexpandedString()))
 
-            raise PublishValidationError(
-                "Invalid paths found", title=self.label)
+        if invalid:
+            all_container_vars = set()
+            for param in invalid:
+                value = param.unexpandedString()
+                contained_vars = [
+                    var for var in self.prohibited_vars
+                    if var in value
+                ]
+                all_container_vars.update(contained_vars)
+
+                self.log.error(
+                    "Parm {} contains prohibited vars {}: {}".format(
+                        param.path(),
+                        ", ".join(contained_vars),
+                        value)
+                )
+
+            message = (
+                "Prohibited vars {} found in parameter values".format(
+                    ", ".join(all_container_vars)
+                )
+            )
+            raise PublishValidationError(message, title=self.label)
 
     @classmethod
     def get_invalid(cls):
@@ -63,7 +82,7 @@ class ValidateWorkfilePaths(
     def repair(cls, instance):
         invalid = cls.get_invalid()
         for param in invalid:
-            cls.log.info("processing: {}".format(param.path()))
+            cls.log.info("Processing: {}".format(param.path()))
             cls.log.info("Replacing {} for {}".format(
                 param.unexpandedString(),
                 hou.text.expandString(param.unexpandedString())))