Remove internal *ColorSpace* and *NamedTransform* duplication. Ensure that HDR views are first in the active_views list.

Signed-off-by: Thomas Mansencal <[email protected]>

Author: KelSolaar

opencolorio_config_aces/config/cg/generate/config.py

@@ -1142,6 +1142,32 @@ def view_filterer(transform):
 
     # CLF Transforms & BuiltinTransform Creation
     # ==========================================
+    def remove_existing_colorspace(name):
+        """Remove given existing *ColorSpace* from the current config data."""
+
+        for i, colorspace in enumerate(data.colorspaces[:]):
+            if colorspace["name"] == name:
+                LOGGER.info(
+                    'Removing existing "%s" "ColorSpace" transform from '
+                    "current config data.",
+                    name,
+                )
+
+                data.colorspaces.pop(i)
+
+    def remove_existing_named_transform(name):
+        """Remove given existing *NamedTransform* from the current config data."""
+
+        for i, named_transform in enumerate(data.named_transforms[:]):
+            if named_transform["name"] == name:
+                LOGGER.info(
+                    'Removing existing "%s" "NamedTransform" transform from '
+                    "current config data.",
+                    name,
+                )
+
+                data.named_transforms.pop(i)
+
     for transform_data in yield_from_config_mapping():
         # Inherited from the "Reference" config.
         if (
@@ -1178,16 +1204,22 @@ def view_filterer(transform):
 
                 colorspace = style_to_colorspace(**kwargs)
                 colorspace["transforms_data"] = [transform_data]
+
+                remove_existing_colorspace(colorspace["name"])
+
                 data.colorspaces.append(colorspace)
             elif transform_data["interface"] == "NamedTransform":
                 LOGGER.info(
                     'Creating a "NamedTransform" transform for "%s" style...',
                     style,
                 )
 
-                colorspace = style_to_named_transform(**kwargs)
-                colorspace["transforms_data"] = [transform_data]
-                data.named_transforms.append(colorspace)
+                named_transform = style_to_named_transform(**kwargs)
+                named_transform["transforms_data"] = [transform_data]
+
+                remove_existing_named_transform(named_transform["name"])
+
+                data.named_transforms.append(named_transform)
 
             if style and clf_transform_id:
                 LOGGER.warning(
@@ -1215,6 +1247,9 @@ def view_filterer(transform):
 
                 named_transform = clf_transform_to_named_transform(**kwargs)
                 named_transform["transforms_data"] = [transform_data]
+
+                remove_existing_named_transform(named_transform["name"])
+
                 data.named_transforms.append(named_transform)
             else:
                 LOGGER.info(
@@ -1224,6 +1259,9 @@ def view_filterer(transform):
 
                 colorspace = clf_transform_to_colorspace(**kwargs)
                 colorspace["transforms_data"] = [transform_data]
+
+                remove_existing_colorspace(colorspace["name"])
+
                 data.colorspaces.append(colorspace)
 
     # Inactive Colorspaces Filtering
@@ -1292,6 +1330,12 @@ def ordering(element):
     data.view_transforms = sorted(data.view_transforms, key=lambda x: ordering(x))
     data.looks = sorted(data.looks, key=lambda x: ordering(x))
 
+    for active_view in data.active_views[:]:
+        for pattern in ("SDR", "Un-tone-mapped", "Raw"):
+            if pattern in active_view:
+                data.active_views.remove(active_view)
+                data.active_views.append(active_view)
+
     data.profile_version = build_configuration.ocio
 
     config = generate_config(data, config_name, validate)

opencolorio_config_aces/config/reference/generate/config.py

@@ -1188,11 +1188,13 @@ def generate_config_aces(
                 display["transforms_data"] = [transform_data]
                 display_name = display["name"]
 
-                if display not in displays:
-                    displays.append(display)
-
-                if display_name not in display_names:
+                if display_name in display_names:
+                    for existing_display in displays:
+                        if existing_display["name"] == display_name:
+                            existing_display["transforms_data"].append(transform_data)
+                else:
                     display_names.append(display_name)
+                    displays.append(display)
 
                 shared_view = {
                     "display": display_name,