From d1f77b7383029a3269583803258adb946d44a8a2 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 10:57:32 +0200
Subject: [PATCH 1/8] multichannel openclip create

---
 openpype/hosts/flame/api/plugin.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 145b1f09212..a76e5ccc840 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -751,17 +751,18 @@ def _create_new_open_clip(self):
         self.log.info("Building new openClip")
         self.log.debug(">> self.clip_data: {}".format(self.clip_data))
 
-        # clip data comming from MediaInfoFile
-        tmp_xml_feeds = self.clip_data.find('tracks/track/feeds')
-        tmp_xml_feeds.set('currentVersion', self.feed_version_name)
-        for tmp_feed in tmp_xml_feeds:
-            tmp_feed.set('vuid', self.feed_version_name)
+        for tmp_xml_track in self.clip_data.iter("track"):
+            tmp_xml_feeds = tmp_xml_track.find('feeds')
+            tmp_xml_feeds.set('currentVersion', self.feed_version_name)
 
-            # add colorspace if any is set
-            if self.feed_colorspace:
-                self._add_colorspace(tmp_feed, self.feed_colorspace)
+            for tmp_feed in tmp_xml_track.iter("feed"):
+                tmp_feed.set('vuid', self.feed_version_name)
 
-            self._clear_handler(tmp_feed)
+                # add colorspace if any is set
+                if self.feed_colorspace:
+                    self._add_colorspace(tmp_feed, self.feed_colorspace)
+
+                self._clear_handler(tmp_feed)
 
         tmp_xml_versions_obj = self.clip_data.find('versions')
         tmp_xml_versions_obj.set('currentVersion', self.feed_version_name)
@@ -812,6 +813,7 @@ def _update_open_clip(self):
 
         feed_added = False
         if not self._feed_exists(out_xml, new_path):
+
             tmp_xml_feed.set('vuid', self.feed_version_name)
             # Append new temp file feed to .clip source out xml
             out_track = out_xml.find("tracks/track")

From fb121844300e904038d33ad4b34989a6244b6a6c Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 12:17:40 +0200
Subject: [PATCH 2/8] updating multichannel openclip

---
 openpype/hosts/flame/api/plugin.py | 125 ++++++++++++++++++-----------
 1 file changed, 78 insertions(+), 47 deletions(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index a76e5ccc840..9f09fa13cef 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -775,6 +775,15 @@ def _create_new_open_clip(self):
 
         self.write_clip_data_to_file(self.out_file, self.clip_data)
 
+    def _get_xml_track_obj_by_uid(self, xml_data, uid):
+        # loop all tracks of input xml data
+        for xml_track in xml_data.iter("track"):
+            track_uid = xml_track.get("uid")
+
+            # get matching uids
+            if uid == track_uid:
+                return xml_track
+
     def _update_open_clip(self):
         self.log.info("Updating openClip ..")
 
@@ -784,53 +793,75 @@ def _update_open_clip(self):
         self.log.debug(">> out_xml: {}".format(out_xml))
         self.log.debug(">> self.clip_data: {}".format(self.clip_data))
 
-        # Get new feed from tmp file
-        tmp_xml_feed = self.clip_data.find('tracks/track/feeds/feed')
-
-        self._clear_handler(tmp_xml_feed)
-
-        # update fps from MediaInfoFile class
-        if self.fps:
-            tmp_feed_fps_obj = tmp_xml_feed.find(
-                "startTimecode/rate")
-            tmp_feed_fps_obj.text = str(self.fps)
-
-        # update start_frame from MediaInfoFile class
-        if self.start_frame:
-            tmp_feed_nb_ticks_obj = tmp_xml_feed.find(
-                "startTimecode/nbTicks")
-            tmp_feed_nb_ticks_obj.text = str(self.start_frame)
-
-        # update drop_mode from MediaInfoFile class
-        if self.drop_mode:
-            tmp_feed_drop_mode_obj = tmp_xml_feed.find(
-                "startTimecode/dropMode")
-            tmp_feed_drop_mode_obj.text = str(self.drop_mode)
-
-        new_path_obj = tmp_xml_feed.find(
-            "spans/span/path")
-        new_path = new_path_obj.text
-
-        feed_added = False
-        if not self._feed_exists(out_xml, new_path):
-
-            tmp_xml_feed.set('vuid', self.feed_version_name)
-            # Append new temp file feed to .clip source out xml
-            out_track = out_xml.find("tracks/track")
-            # add colorspace if any is set
-            if self.feed_colorspace:
-                self._add_colorspace(tmp_xml_feed, self.feed_colorspace)
-
-            out_feeds = out_track.find('feeds')
-            out_feeds.set('currentVersion', self.feed_version_name)
-            out_feeds.append(tmp_xml_feed)
-
-            self.log.info(
-                "Appending new feed: {}".format(
-                    self.feed_version_name))
-            feed_added = True
-
-        if feed_added:
+        # loop tmp tracks
+        updated_any = []
+        for tmp_xml_track in self.clip_data.iter("track"):
+            # get tmp track uid
+            tmp_track_uid = tmp_xml_track.get("uid")
+            # get out data track by uid
+            out_track_element = self._get_xml_track_obj_by_uid(
+                out_xml, tmp_track_uid)
+
+            # loop tmp feeds
+            for tmp_xml_feed in tmp_xml_track.iter("feed"):
+                new_path_obj = tmp_xml_feed.find(
+                    "spans/span/path")
+                new_path = new_path_obj.text
+
+                # check if feed path already exists in track's feeds
+                if (
+                    out_track_element
+                    and not self._feed_exists(out_track_element, new_path)
+                ):
+                    continue
+
+                # rename versions on feeds
+                tmp_xml_feed.set('vuid', self.feed_version_name)
+                self._clear_handler(tmp_xml_feed)
+
+                # update fps from MediaInfoFile class
+                if self.fps:
+                    tmp_feed_fps_obj = tmp_xml_feed.find(
+                        "startTimecode/rate")
+                    tmp_feed_fps_obj.text = str(self.fps)
+
+                # update start_frame from MediaInfoFile class
+                if self.start_frame:
+                    tmp_feed_nb_ticks_obj = tmp_xml_feed.find(
+                        "startTimecode/nbTicks")
+                    tmp_feed_nb_ticks_obj.text = str(self.start_frame)
+
+                # update drop_mode from MediaInfoFile class
+                if self.drop_mode:
+                    tmp_feed_drop_mode_obj = tmp_xml_feed.find(
+                        "startTimecode/dropMode")
+                    tmp_feed_drop_mode_obj.text = str(self.drop_mode)
+
+                # add colorspace if any is set
+                if self.feed_colorspace:
+                    self._add_colorspace(tmp_xml_feed, self.feed_colorspace)
+
+                # then append/update feed to correct track in output
+                if out_track_element:
+                    # update already present track
+                    out_feeds = out_track_element.find('feeds')
+                    out_feeds.set('currentVersion', self.feed_version_name)
+                    out_feeds.append(tmp_xml_feed)
+
+                    self.log.info(
+                        "Appending new feed: {}".format(
+                            self.feed_version_name))
+                else:
+                    # create new track as it doesnt exists yet
+                    # set current version to feeds on tmp
+                    tmp_xml_feeds = tmp_xml_track.find('feeds')
+                    tmp_xml_feeds.set('currentVersion', self.feed_version_name)
+                    out_tracks = out_xml.find("tracks")
+                    out_tracks.append(tmp_xml_track)
+
+                updated_any.append(True)
+
+        if any(updated_any):
             # Append vUID to versions
             out_xml_versions_obj = out_xml.find('versions')
             out_xml_versions_obj.set(

From fa3409d30258ba9dcbaec48cec0995e494560778 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 12:37:49 +0200
Subject: [PATCH 3/8] fix logging in plugin

---
 openpype/hosts/flame/api/lib.py                      | 6 +++---
 openpype/hosts/flame/api/plugin.py                   | 8 ++++++--
 openpype/hosts/flame/plugins/load/load_clip.py       | 6 +++---
 openpype/hosts/flame/plugins/load/load_clip_batch.py | 5 ++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/flame/api/lib.py b/openpype/hosts/flame/api/lib.py
index 94c46fe9372..b7f7b24e515 100644
--- a/openpype/hosts/flame/api/lib.py
+++ b/openpype/hosts/flame/api/lib.py
@@ -766,11 +766,11 @@ class MediaInfoFile(object):
     _drop_mode = None
     _file_pattern = None
 
-    def __init__(self, path, **kwargs):
+    def __init__(self, path, logger=None):
 
         # replace log if any
-        if kwargs.get("logger"):
-            self.log = kwargs["logger"]
+        if logger:
+            self.log = logger
 
         # test if `dl_get_media_info` paht exists
         self._validate_media_script_path()
diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 9f09fa13cef..205acf51b0b 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -694,16 +694,20 @@ class OpenClipSolver(flib.MediaInfoFile):
 
     log = log
 
-    def __init__(self, openclip_file_path, feed_data):
+    def __init__(self, openclip_file_path, feed_data, logger=None):
         self.out_file = openclip_file_path
 
+        # replace log if any
+        if logger:
+            self.log = logger
+
         # new feed variables:
         feed_path = feed_data.pop("path")
 
         # initialize parent class
         super(OpenClipSolver, self).__init__(
             feed_path,
-            **feed_data
+            logger=logger
         )
 
         # get other metadata
diff --git a/openpype/hosts/flame/plugins/load/load_clip.py b/openpype/hosts/flame/plugins/load/load_clip.py
index b12f2f96905..0843dde76ad 100644
--- a/openpype/hosts/flame/plugins/load/load_clip.py
+++ b/openpype/hosts/flame/plugins/load/load_clip.py
@@ -4,6 +4,7 @@
 import openpype.hosts.flame.api as opfapi
 from openpype.lib import StringTemplate
 
+
 class LoadClip(opfapi.ClipLoader):
     """Load a subset to timeline as clip
 
@@ -60,8 +61,6 @@ def load(self, context, name, namespace, options):
             "path": self.fname.replace("\\", "/"),
             "colorspace": colorspace,
             "version": "v{:0>3}".format(version_name),
-            "logger": self.log
-
         }
         self.log.debug(pformat(
             loading_context
@@ -69,7 +68,8 @@ def load(self, context, name, namespace, options):
         self.log.debug(openclip_path)
 
         # make openpype clip file
-        opfapi.OpenClipSolver(openclip_path, loading_context).make()
+        opfapi.OpenClipSolver(
+            openclip_path, loading_context, logger=self.log).make()
 
         # prepare Reel group in actual desktop
         opc = self._get_clip(
diff --git a/openpype/hosts/flame/plugins/load/load_clip_batch.py b/openpype/hosts/flame/plugins/load/load_clip_batch.py
index fb4a3dc6e92..3b049b861bf 100644
--- a/openpype/hosts/flame/plugins/load/load_clip_batch.py
+++ b/openpype/hosts/flame/plugins/load/load_clip_batch.py
@@ -64,8 +64,6 @@ def load(self, context, name, namespace, options):
             "path": self.fname.replace("\\", "/"),
             "colorspace": colorspace,
             "version": "v{:0>3}".format(version_name),
-            "logger": self.log
-
         }
         self.log.debug(pformat(
             loading_context
@@ -73,7 +71,8 @@ def load(self, context, name, namespace, options):
         self.log.debug(openclip_path)
 
         # make openpype clip file
-        opfapi.OpenClipSolver(openclip_path, loading_context).make()
+        opfapi.OpenClipSolver(
+            openclip_path, loading_context, logger=self.log).make()
 
         # prepare Reel group in actual desktop
         opc = self._get_clip(

From 3ac038760645bb76c5c60c473b7aa4dc6880e292 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 12:45:46 +0200
Subject: [PATCH 4/8] fix future warning

add logging from lib
---
 openpype/hosts/flame/api/plugin.py                   | 2 +-
 openpype/hosts/flame/plugins/load/load_clip_batch.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 205acf51b0b..59c8dab6317 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -814,7 +814,7 @@ def _update_open_clip(self):
 
                 # check if feed path already exists in track's feeds
                 if (
-                    out_track_element
+                    out_track_element is not None
                     and not self._feed_exists(out_track_element, new_path)
                 ):
                     continue
diff --git a/openpype/hosts/flame/plugins/load/load_clip_batch.py b/openpype/hosts/flame/plugins/load/load_clip_batch.py
index 3b049b861bf..c17e060f5b1 100644
--- a/openpype/hosts/flame/plugins/load/load_clip_batch.py
+++ b/openpype/hosts/flame/plugins/load/load_clip_batch.py
@@ -2,7 +2,7 @@
 import flame
 from pprint import pformat
 import openpype.hosts.flame.api as opfapi
-from openpype.lib import StringTemplate
+from openpype.lib import StringTemplate, Logger
 
 
 class LoadClipBatch(opfapi.ClipLoader):
@@ -24,6 +24,8 @@ class LoadClipBatch(opfapi.ClipLoader):
     reel_name = "OP_LoadedReel"
     clip_name_template = "{asset}_{subset}<_{output}>"
 
+    log = Logger.get_logger(__file__)
+
     def load(self, context, name, namespace, options):
 
         # get flame objects

From 7e35fdcdedf583c8a58ff9cbb93c9067189149dd Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 12:52:08 +0200
Subject: [PATCH 5/8] abstracting logger

---
 openpype/hosts/flame/api/plugin.py                   | 1 +
 openpype/hosts/flame/plugins/load/load_clip_batch.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 59c8dab6317..a3f2f5f2fcc 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -678,6 +678,7 @@ class ClipLoader(LoaderPlugin):
     `update` logic.
 
     """
+    log = log
 
     options = [
         qargparse.Boolean(
diff --git a/openpype/hosts/flame/plugins/load/load_clip_batch.py b/openpype/hosts/flame/plugins/load/load_clip_batch.py
index c17e060f5b1..3b049b861bf 100644
--- a/openpype/hosts/flame/plugins/load/load_clip_batch.py
+++ b/openpype/hosts/flame/plugins/load/load_clip_batch.py
@@ -2,7 +2,7 @@
 import flame
 from pprint import pformat
 import openpype.hosts.flame.api as opfapi
-from openpype.lib import StringTemplate, Logger
+from openpype.lib import StringTemplate
 
 
 class LoadClipBatch(opfapi.ClipLoader):
@@ -24,8 +24,6 @@ class LoadClipBatch(opfapi.ClipLoader):
     reel_name = "OP_LoadedReel"
     clip_name_template = "{asset}_{subset}<_{output}>"
 
-    log = Logger.get_logger(__file__)
-
     def load(self, context, name, namespace, options):
 
         # get flame objects

From 7063d21450607bf07bd430af06fef517044338a3 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 12:58:20 +0200
Subject: [PATCH 6/8] adding logging

---
 openpype/hosts/flame/api/plugin.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index a3f2f5f2fcc..044e86b17f3 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -784,6 +784,8 @@ def _get_xml_track_obj_by_uid(self, xml_data, uid):
         # loop all tracks of input xml data
         for xml_track in xml_data.iter("track"):
             track_uid = xml_track.get("uid")
+            self.log.debug(
+                ">> track_uid:uid: {}:{}".format(track_uid, uid))
 
             # get matching uids
             if uid == track_uid:
@@ -803,9 +805,13 @@ def _update_open_clip(self):
         for tmp_xml_track in self.clip_data.iter("track"):
             # get tmp track uid
             tmp_track_uid = tmp_xml_track.get("uid")
+            self.log.debug(">> tmp_track_uid: {}".format(tmp_track_uid))
+
             # get out data track by uid
             out_track_element = self._get_xml_track_obj_by_uid(
                 out_xml, tmp_track_uid)
+            self.log.debug(
+                ">> out_track_element: {}".format(out_track_element))
 
             # loop tmp feeds
             for tmp_xml_feed in tmp_xml_track.iter("feed"):
@@ -848,6 +854,7 @@ def _update_open_clip(self):
 
                 # then append/update feed to correct track in output
                 if out_track_element:
+                    self.log.debug("updating track element ..")
                     # update already present track
                     out_feeds = out_track_element.find('feeds')
                     out_feeds.set('currentVersion', self.feed_version_name)
@@ -857,6 +864,7 @@ def _update_open_clip(self):
                         "Appending new feed: {}".format(
                             self.feed_version_name))
                 else:
+                    self.log.debug("adding new track element ..")
                     # create new track as it doesnt exists yet
                     # set current version to feeds on tmp
                     tmp_xml_feeds = tmp_xml_track.find('feeds')

From ca7300a95fd1db17ef6656c6884be7157627c8f8 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 22 Sep 2022 13:41:01 +0200
Subject: [PATCH 7/8] fixing logic

---
 openpype/hosts/flame/api/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 044e86b17f3..6ad33f16a3e 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -822,7 +822,7 @@ def _update_open_clip(self):
                 # check if feed path already exists in track's feeds
                 if (
                     out_track_element is not None
-                    and not self._feed_exists(out_track_element, new_path)
+                    and self._feed_exists(out_track_element, new_path)
                 ):
                     continue
 

From 68ef0e35066c6a2eaff185665d6fd30749a164b5 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 23 Sep 2022 13:23:18 +0200
Subject: [PATCH 8/8] making code more appealing

---
 openpype/hosts/flame/api/plugin.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py
index 6ad33f16a3e..1a26e96c792 100644
--- a/openpype/hosts/flame/api/plugin.py
+++ b/openpype/hosts/flame/api/plugin.py
@@ -801,7 +801,7 @@ def _update_open_clip(self):
         self.log.debug(">> self.clip_data: {}".format(self.clip_data))
 
         # loop tmp tracks
-        updated_any = []
+        updated_any = False
         for tmp_xml_track in self.clip_data.iter("track"):
             # get tmp track uid
             tmp_track_uid = tmp_xml_track.get("uid")
@@ -831,25 +831,25 @@ def _update_open_clip(self):
                 self._clear_handler(tmp_xml_feed)
 
                 # update fps from MediaInfoFile class
-                if self.fps:
+                if self.fps is not None:
                     tmp_feed_fps_obj = tmp_xml_feed.find(
                         "startTimecode/rate")
                     tmp_feed_fps_obj.text = str(self.fps)
 
                 # update start_frame from MediaInfoFile class
-                if self.start_frame:
+                if self.start_frame is not None:
                     tmp_feed_nb_ticks_obj = tmp_xml_feed.find(
                         "startTimecode/nbTicks")
                     tmp_feed_nb_ticks_obj.text = str(self.start_frame)
 
                 # update drop_mode from MediaInfoFile class
-                if self.drop_mode:
+                if self.drop_mode is not None:
                     tmp_feed_drop_mode_obj = tmp_xml_feed.find(
                         "startTimecode/dropMode")
                     tmp_feed_drop_mode_obj.text = str(self.drop_mode)
 
                 # add colorspace if any is set
-                if self.feed_colorspace:
+                if self.feed_colorspace is not None:
                     self._add_colorspace(tmp_xml_feed, self.feed_colorspace)
 
                 # then append/update feed to correct track in output
@@ -872,9 +872,9 @@ def _update_open_clip(self):
                     out_tracks = out_xml.find("tracks")
                     out_tracks.append(tmp_xml_track)
 
-                updated_any.append(True)
+                updated_any = True
 
-        if any(updated_any):
+        if updated_any:
             # Append vUID to versions
             out_xml_versions_obj = out_xml.find('versions')
             out_xml_versions_obj.set(