added variables to specify color-coding, and updated formatting

Signed-off-by: Yingjie Wang <[email protected]>

Author: cato-o

src/py-opentimelineio/opentimelineio/console/otiodiff/clipData.py

@@ -2,15 +2,18 @@
 
 # TODO: clip comparable??? ClipInfo
 # source clip or clip ref?
-# full name = name + version, name is just name, add ex, split on space, b4 is name, after is version
+# full name = name + version, name is just name,
+# add ex, split on space, b4 is name, after is version
+
+
 class ClipData:
     full_name = ""
     name = ""
     version = None    # currently not used in comparisons
     media_ref = None
     source_range = otio.opentime.TimeRange()
     timeline_range = otio.opentime.TimeRange()
-    track_num = None    # not originally stored in otio.schema.Clip 
+    track_num = None    # not originally stored in otio.schema.Clip
     source_clip = otio.schema.Clip()
     # everything below holds comparison result info
     note = ""
@@ -27,9 +30,9 @@ def __init__(self, source_clip, track_num, note=None):
         self.source_clip = source_clip
         self.note = note
 
-
     # split full name into name of clip and version by white space
     # uses structure of "clipA v1" where clipA is the name and v1 is the version
+
     def splitFullName(self, clip):
         shortName = clip.name.split(" ")[0]
         version = clip.name.split(" ")[1] if len(clip.name.split(" ")) > 1 else None
@@ -40,19 +43,21 @@ def printData(self):
         print("name: ", self.name)
         print("version: ", self.version)
         print("media ref: ", self.media_ref)
-        print("source start time: ", self.source_range.start_time.value, " duration: ", self.source_range.duration.value)
-        print("timeline start time:", self.timeline_range.start_time.value, " duration: ", self.timeline_range.duration.value)
-        if(self.note != ""):
+        print("source start time: ", self.source_range.start_time.value,
+              " duration: ", self.source_range.duration.value)
+        print("timeline start time:", self.timeline_range.start_time.value,
+              " duration: ", self.timeline_range.duration.value)
+        if (self.note != ""):
             print("note: ", self.note)
         print("source clip: ", self.source.name)
 
     # compare truncated names
     def sameName(self, cA):
-        if(self.name.lower() == cA.name.lower()):
+        if (self.name.lower() == cA.name.lower()):
             return True
         else:
             return False
-        
+
     # note: local and source duration should always match, can assume same
     # compare the duration within the timeline for 2 clips
     def sameDuration(self, cA):
@@ -66,17 +71,19 @@ def checkSame(self, cA):
         if self.sameName(cA):
             # check source range is same
             # TODO: call trimmed range instead of source range ???
-            # TODO: make test where has null source range -> see things break, then go back and change <- low priority
-            if(self.source_range == cA.source_range):
+            # TODO: make test where has null source range -> see things break,
+            # then go back and change <- low priority
+            if (self.source_range == cA.source_range):
                 # print(self.name, " ", self.timeline_range, " ", cA.timeline_range)
                 # check in same place on timeline
-                if(self.timeline_range == cA.timeline_range):
+                if (self.timeline_range == cA.timeline_range):
                     isSame = True
                     # check duration is same but not necessarily in same place on timeline
                 # TODO: change to else? (does the elif always run?)
-                elif(self.sameDuration(cA)):
+                elif (self.sameDuration(cA)):
                     # Note: check in relation to left and right?
-                    #       know if moved in seq rather than everything shifted over because of lengthen/shorten of other clips
+                    #       know if moved in seq rather than everything shifted over
+                    # because of lengthen/shorten of other clips
                     isSame = True
                     self.note = "shifted laterally in track"
             else:
@@ -86,15 +93,17 @@ def checkSame(self, cA):
                 pass
 
         return isSame
-    
-    # compare 2 clips and see if they have been 
+
+    # compare 2 clips and see if they have been
     # compare self: "new", to old
     def checkEdited(self, cA):
         isEdited = False
 
         # Note: assumption that source range and timeline range duration always equal
-        # assert(self.source_range.duration.value == self.timeline_range.duration.value), "clip source range and timeline range durations don't match"
-        # assert(cA.source_range.duration.value == cA.timeline_range.duration.value), "clip source range and timeline range durations don't match"
+        # assert(self.source_range.duration.value == self.timeline_range.duration.value
+        # ), "clip source range and timeline range durations don't match"
+        # assert(cA.source_range.duration.value == cA.timeline_range.duration.value
+        # ), "clip source range and timeline range durations don't match"
 
         selfDur = self.source_range.duration
         cADur = cA.source_range.duration
@@ -109,34 +118,34 @@ def checkEdited(self, cA):
         #         # self.printData()
         #         # cA.printData()
         #         self.note = "source range start times differ"
-        #         isEdited = True  
+        #         isEdited = True
 
-        if(self.source_range != cA.source_range):
+        if (self.source_range != cA.source_range):
             self.note = "source range changed"
             isEdited = True
             deltaFramesStr = str(abs(selfDur.to_frames() - cADur.to_frames()))
 
-            if(selfDur.value == cADur.value):
+            if (selfDur.value == cADur.value):
                 self.note = "start time in source range changed"
 
 # put note assignment into function, return note?
 # self, other, olderClipData rather than cA
             # clip duration shorter
-            elif(selfDur.value < cADur.value):
+            elif (selfDur.value < cADur.value):
                 self.note = "trimmed " + deltaFramesStr + " frames"
-            
-                if(selfSourceStart.value == cASourceStart.value):
+
+                if (selfSourceStart.value == cASourceStart.value):
                     self.note = "trimmed tail by " + deltaFramesStr + " frames"
-                elif(selfSourceStart.value < cASourceStart.value):
+                elif (selfSourceStart.value < cASourceStart.value):
                     self.note = "trimmed head by " + deltaFramesStr + " frames"
 
             # clip duration longer
-            elif(selfDur.value > cADur.value):
+            elif (selfDur.value > cADur.value):
                 self.note = "lengthened " + deltaFramesStr + " frames"
 
-                if(selfSourceStart.value == cASourceStart.value):
+                if (selfSourceStart.value == cASourceStart.value):
                     self.note = "lengthened tail by " + deltaFramesStr + " frames"
-                elif(selfSourceStart.value > cASourceStart.value):
+                elif (selfSourceStart.value > cASourceStart.value):
                     self.note = "lengthened head by " + deltaFramesStr + " frames"
 
-        return isEdited
+        return isEdited