From 40d4fea857202fcb4194376511f208d8db0f3655 Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Mon, 15 May 2023 14:10:49 +0200
Subject: [PATCH] Maya: Validate shader name - OP-5903 (#4971)

* Fix regex matching.

* Add active setting

* Update openpype/hosts/maya/plugins/publish/validate_shader_name.py
---
 .../plugins/publish/validate_shader_name.py   | 20 +++++++++----------
 .../defaults/project_settings/maya.json       |  1 +
 .../schemas/schema_maya_publish.json          |  5 +++++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_shader_name.py b/openpype/hosts/maya/plugins/publish/validate_shader_name.py
index b3e51f011d..034db471da 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shader_name.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shader_name.py
@@ -50,7 +50,8 @@ class ValidateShaderName(pyblish.api.InstancePlugin):
         asset_name = instance.data.get("asset", None)
 
         # Check the number of connected shadingEngines per shape
-        r = re.compile(cls.regex)
+        regex_compile = re.compile(cls.regex)
+        error_message = "object {0} has invalid shader name {1}"
         for shape in shapes:
             shading_engines = cmds.listConnections(shape,
                                                    destination=True,
@@ -60,19 +61,18 @@ class ValidateShaderName(pyblish.api.InstancePlugin):
             )
 
             for shader in shaders:
-                m = r.match(cls.regex, shader)
+                m = regex_compile.match(shader)
                 if m is None:
                     invalid.append(shape)
-                    cls.log.error(
-                        "object {0} has invalid shader name {1}".format(shape,
-                                                                        shader)
-                    )
+                    cls.log.error(error_message.format(shape, shader))
                 else:
-                    if 'asset' in r.groupindex:
+                    if 'asset' in regex_compile.groupindex:
                         if m.group('asset') != asset_name:
                             invalid.append(shape)
-                            cls.log.error(("object {0} has invalid "
-                                           "shader name {1}").format(shape,
-                                                                     shader))
+                            message = error_message
+                            message += " with missing asset name \"{2}\""
+                            cls.log.error(
+                                message.format(shape, shader, asset_name)
+                            )
 
         return invalid
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 72b330ce7a..a2a43eefb5 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -734,6 +734,7 @@
         "ValidateShaderName": {
             "enabled": false,
             "optional": true,
+            "active": true,
             "regex": "(?P<asset>.*)_(.*)_SHD"
         },
         "ValidateShadingEngine": {
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
index 346948c658..07c8d8715b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@@ -126,6 +126,11 @@
                     "key": "optional",
                     "label": "Optional"
                 },
+                {
+                    "type": "boolean",
+                    "key": "active",
+                    "label": "Active"
+                },
                 {
                     "type": "label",
                     "label": "Shader name regex can use named capture group <b>asset</b> to validate against current asset name.<p><b>Example:</b><br/><code>^.*(?P=&lt;asset&gt;.+)_SHD</code></p>"