From f13923d31ccae0a0455fb36bb09dd225c6b4e0e3 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Wed, 22 Dec 2021 11:04:10 +0100
Subject: [PATCH] raise PublishXmlValidationError in validate duplicated layer
 names

---
 .../help/validate_duplicated_layer_names.xml  | 22 +++++++++++++++++++
 .../validate_duplicated_layer_names.py        | 15 +++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 openpype/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml

diff --git a/openpype/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml b/openpype/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
new file mode 100644
index 0000000000..5d798544c0
--- /dev/null
+++ b/openpype/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+<error id="main">
+<title>Layer names</title>
+<description>## Duplicated layer names
+
+Can't determine which layers should be published because there are duplicated layer names in the scene.
+
+### Duplicated layer names
+
+{layer_names}
+
+*Check layer names for all subsets in list on left side.*
+
+### How to repair?
+
+Hide/rename/remove layers that should not be published.
+
+If all of them should be published then you have duplicated subset names in the scene. In that case you have to recrete them and use different variant name.
+</description>
+</error>
+</root>
diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py b/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
index efccf19ef9..9f61bdbcd0 100644
--- a/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
@@ -1,4 +1,5 @@
 import pyblish.api
+from openpype.pipeline import PublishXmlValidationError
 
 
 class ValidateLayersGroup(pyblish.api.InstancePlugin):
@@ -30,14 +31,20 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin):
             "\"{}\"".format(layer_name)
             for layer_name in duplicated_layer_names
         ])
-
-        # Raise an error
-        raise AssertionError(
+        detail_lines = [
+            "- {}".format(layer_name)
+            for layer_name in set(duplicated_layer_names)
+        ]
+        raise PublishXmlValidationError(
+            self,
             (
                 "Layers have duplicated names for instance {}."
                 # Description what's wrong
                 " There are layers with same name and one of them is marked"
                 " for publishing so it is not possible to know which should"
                 " be published. Please look for layers with names: {}"
-            ).format(instance.data["label"], layers_msg)
+            ).format(instance.data["label"], layers_msg),
+            formatting_data={
+                "layer_names": "<br/>".join(detail_lines)
+            }
         )