From 6e7cde73be7c3309deb78f10324d8779e354f5cc Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 21 Sep 2023 17:17:45 +0200
Subject: [PATCH] second part of previous commit

---
 openpype/pipeline/colorspace.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/openpype/pipeline/colorspace.py b/openpype/pipeline/colorspace.py
index 677656c02f..1bb4624537 100644
--- a/openpype/pipeline/colorspace.py
+++ b/openpype/pipeline/colorspace.py
@@ -353,29 +353,28 @@ def parse_colorspace_from_filepath(
             "Must provide `config_path` if `colorspaces` is not provided."
         )
 
-    colorspace_name = None
     colorspaces = colorspaces or get_ocio_config_colorspaces(config_path)
-    underscored_colorspaces = list({
-        key.replace(" ", "_") for key in colorspaces
+    underscored_colorspaces = {
+        key.replace(" ", "_"): key for key in colorspaces
         if " " in key
-    })
+    }
 
     # match colorspace from  filepath
     regex_pattern = _get_colorspace_match_regex(
-        colorspaces + underscored_colorspaces)
+        colorspaces + underscored_colorspaces.keys())
     match = regex_pattern.search(filepath)
     colorspace = match.group(0) if match else None
 
     if colorspace:
-        colorspace_name = colorspace
+        return colorspace
 
-    if not colorspace_name:
-        log.info("No matching colorspace in config '{}' for path: '{}'".format(
-            config_path, filepath
-        ))
-        return None
+    if colorspace in underscored_colorspaces:
+        return underscored_colorspaces[colorspace]
 
-    return colorspace_name
+    log.info("No matching colorspace in config '{}' for path: '{}'".format(
+        config_path, filepath
+    ))
+    return None
 
 
 def validate_imageio_colorspace_in_config(config_path, colorspace_name):