Refactor clip product name handling logic

- Refactored how clip product names are generated and validated to avoid duplicates.
ynput · Nov 7, 2024 · f56e5ef · f56e5ef
1 parent 984f079
commit f56e5ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/client/ayon_flame/api/plugin.py b/client/ayon_flame/api/plugin.py
@@ -659,9 +659,17 @@ def _convert_to_marker_data(self):
                 # in case track clip product name had been already used
                 # then add product name with clip index
                 if clip_product_name in used_names_list:
-                    clip_product_name = (
+                    _clip_product_name = (
                         f"{clip_product_name}{self.cs_index}"
                     )
+                    # just in case lets validate if new name is not used
+                    # in case the track_index is the same as clip_index
+                    if _clip_product_name in used_names_list:
+                        _clip_product_name = (
+                            f"{clip_product_name}"
+                            f"{self.track_index}{self.cs_index}"
+                        )
+                    clip_product_name = _clip_product_name
 
                 self.log.debug(
                     f">> clip_product_name: {clip_product_name}")

diff --git a/client/ayon_flame/plugins/publish/collect_timeline_otio.py b/client/ayon_flame/plugins/publish/collect_timeline_otio.py
@@ -22,7 +22,6 @@ def process(self, context):
         with ayfapi.maintained_segment_selection(sequence) as selected_seg:
             otio_timeline = flame_export.create_otio_timeline(sequence)
 
-
             # update context with main project attributes
             timeline_data = {
                 "flameProject": project,