Merge branch 'develop' into feature/PYPE-654-nks-cut-reference-videos

pype/plugins/nukestudio/publish/collect_clips.py

@@ -47,6 +47,16 @@ class CollectClips(api.ContextPlugin):
                 track = item.parent()
                 source = item.source().mediaSource()
                 source_path = source.firstpath()
+                file_head = source.filenameHead()
+                file_info = next((f for f in source.fileinfos()), None)
+                source_first_frame = file_info.startFrame()
+                is_sequence = False
+
+                if not source.singleFile():
+                    self.log.info("Single file")
+                    is_sequence = True
+                    source_path = file_info.filename()
+
                 effects = [f for f in item.linkedItems()
                            if f.isEnabled()
                            if isinstance(f, hiero.core.EffectTrackItem)]
@@ -78,12 +88,6 @@ class CollectClips(api.ContextPlugin):
                         )
                     )
 
-                try:
-                    head, padding, ext = os.path.basename(source_path).split(".")
-                    source_first_frame = int(padding)
-                except Exception:
-                    source_first_frame = 0
-
                 data.update({
                         "name": "{0}_{1}".format(track.name(), item.name()),
                         "item": item,
@@ -91,6 +95,8 @@ class CollectClips(api.ContextPlugin):
                         "timecodeStart": str(source.timecodeStart()),
                         "timelineTimecodeStart": str(sequence.timecodeStart()),
                         "sourcePath": source_path,
+                        "sourceFileHead": file_head,
+                        "isSequence": is_sequence,
                         "track": track.name(),
                         "trackIndex": track_index,
                         "sourceFirst": source_first_frame,
@@ -100,8 +106,9 @@ class CollectClips(api.ContextPlugin):
                         "mediaDuration": source.duration(),
                         "clipIn": int(item.timelineIn()),
                         "clipOut": int(item.timelineOut()),
-                        "clipDuration": (int(item.timelineOut()) -
-                            int(item.timelineIn())) + 1,
+                        "clipDuration": (
+                            int(item.timelineOut()) - int(
+                                item.timelineIn())) + 1,
                         "asset": asset,
                         "family": "clip",
                         "families": [],

pype/plugins/nukestudio/publish/collect_plates.py

@@ -147,21 +147,15 @@ class CollectPlatesData(api.InstancePlugin):
                 "version": version
             })
 
-        try:
-            basename, ext = os.path.splitext(source_file)
-            head, padding = os.path.splitext(basename)
-            ext = ext[1:]
-            padding = padding[1:]
-            self.log.debug("_ padding: `{}`".format(padding))
-            # head, padding, ext = source_file.split('.')
-            source_first_frame = int(padding)
-            padding = len(padding)
-            file = "{head}.%0{padding}d.{ext}".format(
-                head=head,
-                padding=padding,
-                ext=ext
-            )
+        source_first_frame = instance.data.get("sourceFirst")
+        source_file_head = instance.data.get("sourceFileHead")
 
+        if instance.data.get("isSequence", False):
+            self.log.info("Is sequence of files")
+            file = os.path.basename(source_file)
+            ext = os.path.splitext(file)[-1][1:]
+            self.log.debug("source_file_head: `{}`".format(source_file_head))
+            head = source_file_head[:-1]
             start_frame = int(source_first_frame + instance.data["sourceInH"])
             duration = int(
                 instance.data["sourceOutH"] - instance.data["sourceInH"])
@@ -169,10 +163,10 @@ class CollectPlatesData(api.InstancePlugin):
             self.log.debug("start_frame: `{}`".format(start_frame))
             self.log.debug("end_frame: `{}`".format(end_frame))
             files = [file % i for i in range(start_frame, (end_frame + 1), 1)]
-        except Exception as e:
-            self.log.warning("Exception in file: {}".format(e))
-            head, ext = os.path.splitext(source_file)
-            ext = ext[1:]
+        else:
+            self.log.info("Is single file")
+            ext = os.path.splitext(source_file)[-1][1:]
+            head = source_file_head
             files = source_file
             start_frame = instance.data["sourceInH"]
             end_frame = instance.data["sourceOutH"]

pype/plugins/nukestudio/publish/collect_reviews.py

@@ -161,13 +161,16 @@ class CollectReviews(api.InstancePlugin):
             "handleStart", "handleEnd", "sourceIn", "sourceOut",
             "frameStart", "frameEnd", "sourceInH", "sourceOutH",
             "clipIn", "clipOut", "clipInH", "clipOutH", "asset",
-            "track", "version"
+            "track"
         ]
 
         version_data = dict()
         # pass data to version
         version_data.update({k: instance.data[k] for k in transfer_data})
 
+        if 'version' in instance.data:
+            version_data["version"] = instance.data[version]
+
         # add to data of representation
         version_data.update({
             "colorspace": item.sourceMediaColourTransform(),