From 790850697f4742081779bccdc8230c1c04100f39 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 31 Mar 2022 13:16:52 +0200
Subject: [PATCH] OP-2517 - fix renaming subset incorrectly in PS

---
 .../hosts/photoshop/plugins/publish/validate_naming.py   | 9 +++++----
 .../settings/defaults/project_settings/photoshop.json    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/photoshop/plugins/publish/validate_naming.py b/openpype/hosts/photoshop/plugins/publish/validate_naming.py
index b40e44d016..583e9c7a4e 100644
--- a/openpype/hosts/photoshop/plugins/publish/validate_naming.py
+++ b/openpype/hosts/photoshop/plugins/publish/validate_naming.py
@@ -29,7 +29,8 @@ class ValidateNamingRepair(pyblish.api.Action):
         stub = photoshop.stub()
         for instance in instances:
             self.log.info("validate_naming instance {}".format(instance))
-            metadata = stub.read(instance[0])
+            layer_item = instance.data["layer"]
+            metadata = stub.read(layer_item)
             self.log.info("metadata instance {}".format(metadata))
             layer_name = None
             if metadata.get("uuid"):
@@ -43,11 +44,11 @@ class ValidateNamingRepair(pyblish.api.Action):
                     stub.rename_layer(instance.data["uuid"], layer_name)
 
             subset_name = re.sub(invalid_chars, replace_char,
-                                 instance.data["name"])
+                                 instance.data["subset"])
 
-            instance[0].Name = layer_name or subset_name
+            layer_item.name = layer_name or subset_name
             metadata["subset"] = subset_name
-            stub.imprint(instance[0], metadata)
+            stub.imprint(layer_item, metadata)
 
         return True
 
diff --git a/openpype/settings/defaults/project_settings/photoshop.json b/openpype/settings/defaults/project_settings/photoshop.json
index 118b9c721e..822a94a8eb 100644
--- a/openpype/settings/defaults/project_settings/photoshop.json
+++ b/openpype/settings/defaults/project_settings/photoshop.json
@@ -18,7 +18,7 @@
             "active": true
         },
         "ValidateNaming": {
-            "invalid_chars": "[ \\\\/+\\*\\?\\(\\)\\[\\]\\{\\}:,]",
+            "invalid_chars": "[ \\\\/+\\*\\?\\(\\)\\[\\]\\{\\}:,;]",
             "replace_char": "_"
         },
         "ExtractImage": {