pycmx 1.2.2__py3-none-any.whl → 1.3.0__py3-none-any.whl

pycmx/__init__.py

@@ -2,13 +2,11 @@
 """
 pycmx is a parser for CMX 3600-style EDLs.
 
-This module (c) 2023 Jamie Hardt. For more information on your rights to
+This module (c) 2025 Jamie Hardt. For more information on your rights to
 copy and reuse this software, refer to the LICENSE file included with the
 distribution.
 """
 
-__version__ = '1.2.2'
-
 from .parse_cmx_events import parse_cmx3600
 from .transition import Transition
 from .event import Event

pycmx/channel_map.py

@@ -4,23 +4,24 @@
 from re import (compile, match)
 from typing import Dict, Tuple, Generator
 
+
 class ChannelMap:
     """
     Represents a set of all the channels to which an event applies.
     """
 
-    _chan_map : Dict[str, Tuple] = {     
-                "V" :    (True,   False,   False),
-                "A" :    (False,  True,    False),
-                "A2" :   (False,  False,   True),
-                "AA" :   (False,  True,    True),
-                "B" :    (True,   True,    False),
-                "AA/V" : (True,   True,    True),
-                "A2/V" : (True,   False,   True)
-        }
+    _chan_map: Dict[str, Tuple] = {
+        "V":    (True,   False,   False),
+        "A":    (False,  True,    False),
+        "A2":   (False,  False,   True),
+        "AA":   (False,  True,    True),
+        "B":    (True,   True,    False),
+        "AA/V": (True,   True,    True),
+        "A2/V": (True,   False,   True)
+    }
 
     def __init__(self, v=False, audio_channels=set()):
-        self._audio_channel_set = audio_channels 
+        self._audio_channel_set = audio_channels
         self.v = v
 
     @property
@@ -46,7 +47,7 @@ class ChannelMap:
 
     @a1.setter
     def a1(self, val: bool):
-        self.set_audio_channel(1,val)
+        self.set_audio_channel(1, val)
 
     @property
     def a2(self) -> bool:
@@ -55,7 +56,7 @@ class ChannelMap:
 
     @a2.setter
     def a2(self, val: bool):
-        self.set_audio_channel(2,val)
+        self.set_audio_channel(2, val)
 
     @property
     def a3(self) -> bool:
@@ -64,28 +65,28 @@ class ChannelMap:
 
     @a3.setter
     def a3(self, val: bool):
-        self.set_audio_channel(3,val)
-    
+        self.set_audio_channel(3, val)
+
     @property
     def a4(self) -> bool:
         """True if A4 is included"""
         return self.get_audio_channel(4)
 
     @a4.setter
-    def a4(self,val: bool):
-        self.set_audio_channel(4,val)
+    def a4(self, val: bool):
+        self.set_audio_channel(4, val)
 
     def get_audio_channel(self, chan_num) -> bool:
         """True if chan_num is included"""
         return (chan_num in self._audio_channel_set)
 
-    def set_audio_channel(self,chan_num, enabled: bool):
+    def set_audio_channel(self, chan_num, enabled: bool):
         """If enabled is true, chan_num will be included"""
         if enabled:
             self._audio_channel_set.add(chan_num)
         elif self.get_audio_channel(chan_num):
             self._audio_channel_set.remove(chan_num)
-    
+
     def _append_event(self, event_str):
         alt_channel_re = compile(r'^A(\d+)')
         if event_str in self._chan_map:
@@ -96,7 +97,7 @@ class ChannelMap:
         else:
             matchresult = match(alt_channel_re, event_str)
             if matchresult:
-                self.set_audio_channel(int( matchresult.group(1)), True )
+                self.set_audio_channel(int(matchresult.group(1)), True)
 
     def _append_ext(self, audio_ext):
         self.a3 = audio_ext.audio3
@@ -109,5 +110,4 @@ class ChannelMap:
         out_v = self.video | other.video
         out_a = self._audio_channel_set | other._audio_channel_set
 
-        return ChannelMap(v=out_v,audio_channels = out_a)
-
+        return ChannelMap(v=out_v, audio_channels=out_a)

pycmx/edit.py

@@ -7,23 +7,27 @@ from .channel_map import ChannelMap
 
 from typing import Optional
 
+
 class Edit:
     """
-    An individual source-to-record operation, with a source roll, source and 
+    An individual source-to-record operation, with a source roll, source and
     recorder timecode in and out, a transition and channels.
     """
-    def __init__(self, edit_statement, audio_ext_statement, clip_name_statement, source_file_statement, trans_name_statement = None):
+
+    def __init__(self, edit_statement, audio_ext_statement,
+                 clip_name_statement, source_file_statement,
+                 trans_name_statement=None):
         self.edit_statement = edit_statement
         self.audio_ext = audio_ext_statement
         self.clip_name_statement = clip_name_statement
         self.source_file_statement = source_file_statement
-        self.trans_name_statement = trans_name_statement 
+        self.trans_name_statement = trans_name_statement
 
     @property
     def line_number(self) -> int:
         """
         Get the line number for the "standard form" statement associated with
-        this edit. Line numbers a zero-indexed, such that the 
+        this edit. Line numbers a zero-indexed, such that the
         "TITLE:" record is line zero.
         """
         return self.edit_statement.line_number
@@ -35,7 +39,7 @@ class Edit:
         """
         cm = ChannelMap()
         cm._append_event(self.edit_statement.channels)
-        if self.audio_ext != None:
+        if self.audio_ext is not None:
             cm._append_ext(self.audio_ext)
         return cm
 
@@ -45,10 +49,13 @@ class Edit:
         Get the :obj:`Transition` object associated with this edit.
         """
         if self.trans_name_statement:
-            return Transition(self.edit_statement.trans, self.edit_statement.trans_op, self.trans_name_statement.name)
+            return Transition(self.edit_statement.trans,
+                              self.edit_statement.trans_op,
+                              self.trans_name_statement.name)
         else:
-            return Transition(self.edit_statement.trans, self.edit_statement.trans_op, None)
-    
+            return Transition(self.edit_statement.trans,
+                              self.edit_statement.trans_op, None)
+
     @property
     def source_in(self) -> str:
         """
@@ -116,7 +123,7 @@ class Edit:
     @property
     def clip_name(self) -> Optional[str]:
         """
-        Get the clip name, as attested by a "* FROM CLIP NAME" or "* TO CLIP 
+        Get the clip name, as attested by a "* FROM CLIP NAME" or "* TO CLIP
         NAME" remark on the EDL. This will return None if the information is
         not present.
         """
@@ -124,5 +131,3 @@ class Edit:
             return None
         else:
             return self.clip_name_statement.name
-
-

pycmx/edit_list.py

@@ -1,16 +1,20 @@
 # pycmx
 # (c) 2018 Jamie Hardt
 
-from .parse_cmx_statements import (StmtUnrecognized, StmtFCM, StmtEvent, StmtSourceUMID)
+from .parse_cmx_statements import (
+    StmtUnrecognized, StmtEvent, StmtSourceUMID)
 from .event import Event
 from .channel_map import ChannelMap
 
 from typing import Generator
 
+
 class EditList:
     """
-    Represents an entire edit decision list as returned by :func:`~pycmx.parse_cmx3600()`.
+    Represents an entire edit decision list as returned by
+    :func:`~pycmx.parse_cmx3600()`.
     """
+
     def __init__(self, statements):
         self.title_statement = statements[0]
         self.event_statements = statements[1:]
@@ -20,8 +24,11 @@ class EditList:
         """
         The detected format of the EDL. Possible values are: "3600", "File32",
         "File128", and "unknown".
+
+        Adobe EDLs with more than 999 events will be reported as "3600".
         """
-        first_event = next( (s for s in self.event_statements if type(s) is StmtEvent), None)
+        first_event = next(
+            (s for s in self.event_statements if type(s) is StmtEvent), None)
 
         if first_event:
             if first_event.format == 8:
@@ -34,7 +41,6 @@ class EditList:
                 return 'unknown'
         else:
             return 'unknown'
-        
 
     @property
     def channels(self) -> ChannelMap:
@@ -48,7 +54,6 @@ class EditList:
                 retval = retval | edit.channels
 
         return retval
-        
 
     @property
     def title(self) -> str:
@@ -57,27 +62,23 @@ class EditList:
         """
         return self.title_statement.title
 
-    
     @property
-    def unrecognized_statements(self) -> Generator[StmtUnrecognized, None, None]:
+    def unrecognized_statements(self) -> Generator[StmtUnrecognized,
+                                                   None, None]:
         """
         A generator for all the unrecognized statements in the list.
         """
         for s in self.event_statements:
             if type(s) is StmtUnrecognized:
                 yield s
-        
 
     @property
     def events(self) -> Generator[Event, None, None]:
         'A generator for all the events in the edit list'
-        is_drop = None
         current_event_num = None
         event_statements = []
         for stmt in self.event_statements:
-            if type(stmt) is StmtFCM:
-                is_drop = stmt.drop
-            elif type(stmt) is StmtEvent:
+            if type(stmt) is StmtEvent:
                 if current_event_num is None:
                     current_event_num = stmt.event
                     event_statements.append(stmt)
@@ -101,9 +102,7 @@ class EditList:
         """
         A generator for all of the sources in the list
         """
-        
+
         for stmt in self.event_statements:
             if type(stmt) is StmtSourceUMID:
                 yield stmt
-
-

pycmx/event.py

@@ -1,19 +1,22 @@
 # pycmx
 # (c) 2023 Jamie Hardt
 
-from .parse_cmx_statements import (StmtEvent, StmtClipName, StmtSourceFile, StmtAudioExt, StmtUnrecognized, StmtEffectsName)
-from .edit import Edit 
+from .parse_cmx_statements import (
+    StmtEvent, StmtClipName, StmtSourceFile, StmtAudioExt, StmtUnrecognized,
+    StmtEffectsName)
+from .edit import Edit
 
 from typing import List, Generator, Optional, Tuple, Any
 
+
 class Event:
     """
-    Represents a collection of :class:`~pycmx.edit.Edit` s, all with the same event number.
-    """
+    Represents a collection of :class:`~pycmx.edit.Edit` s, all with the same
+    event number. """
 
     def __init__(self, statements):
         self.statements = statements
-    
+
     @property
     def number(self) -> int:
         """
@@ -28,10 +31,10 @@ class Event:
         will have multiple edits when a dissolve, wipe or key transition needs
         to be performed.
         """
-        edits_audio = list( self._statements_with_audio_ext() )
-        clip_names  = self._clip_name_statements()
-        source_files= self._source_file_statements()
-         
+        edits_audio = list(self._statements_with_audio_ext())
+        clip_names = self._clip_name_statements()
+        source_files = self._source_file_statements()
+
         the_zip: List[List[Any]] = [edits_audio]
 
         if len(edits_audio) == 2:
@@ -45,19 +48,19 @@ class Event:
                     end_name = clip_name
 
             the_zip.append([start_name, end_name])
-        else:    
+        else:
             if len(edits_audio) == len(clip_names):
                 the_zip.append(clip_names)
             else:
-                the_zip.append([None] * len(edits_audio) )
+                the_zip.append([None] * len(edits_audio))
 
         if len(edits_audio) == len(source_files):
             the_zip.append(source_files)
         elif len(source_files) == 1:
-            the_zip.append( source_files * len(edits_audio) )
+            the_zip.append(source_files * len(edits_audio))
         else:
-            the_zip.append([None] * len(edits_audio) )
-        
+            the_zip.append([None] * len(edits_audio))
+
         # attach trans name to last event
         try:
             trans_statement = self._trans_name_statements()[0]
@@ -65,23 +68,25 @@ class Event:
             trans_names.append(trans_statement)
             the_zip.append(trans_names)
         except IndexError:
-            the_zip.append([None] * len(edits_audio) )
-
-        return [ Edit(edit_statement=e1[0],
-                      audio_ext_statement=e1[1],
-                      clip_name_statement=n1,
-                      source_file_statement=s1,
-                      trans_name_statement=u1) for (e1,n1,s1,u1) in zip(*the_zip) ]
-            
+            the_zip.append([None] * len(edits_audio))
+
+        return [Edit(edit_statement=e1[0],
+                     audio_ext_statement=e1[1],
+                     clip_name_statement=n1,
+                     source_file_statement=s1,
+                     trans_name_statement=u1)
+                for (e1, n1, s1, u1) in zip(*the_zip)]
+
     @property
-    def unrecognized_statements(self) -> Generator[StmtUnrecognized, None, None]:
+    def unrecognized_statements(self) -> Generator[StmtUnrecognized, None,
+                                                   None]:
         """
         A generator for all the unrecognized statements in the event.
         """
         for s in self.statements:
             if type(s) is StmtUnrecognized:
                 yield s
-    
+
     def _trans_name_statements(self) -> List[StmtEffectsName]:
         return [s for s in self.statements if type(s) is StmtEffectsName]
 
@@ -90,15 +95,14 @@ class Event:
 
     def _clip_name_statements(self) -> List[StmtClipName]:
         return [s for s in self.statements if type(s) is StmtClipName]
-    
+
     def _source_file_statements(self) -> List[StmtSourceFile]:
         return [s for s in self.statements if type(s) is StmtSourceFile]
-    
-    def _statements_with_audio_ext(self) -> Generator[Tuple[StmtEvent, Optional[StmtAudioExt]], None, None]:
+
+    def _statements_with_audio_ext(self) -> Generator[
+            Tuple[StmtEvent, Optional[StmtAudioExt]], None, None]:
         for (s1, s2) in zip(self.statements, self.statements[1:]):
             if type(s1) is StmtEvent and type(s2) is StmtAudioExt:
-                yield (s1,s2)
+                yield (s1, s2)
             elif type(s1) is StmtEvent:
                 yield (s1, None)
-
- 

pycmx/parse_cmx_events.py

@@ -6,15 +6,15 @@
 from .parse_cmx_statements import (parse_cmx3600_statements)
 from .edit_list import EditList
 
-from typing import TextIO 
+from typing import TextIO
 
-def parse_cmx3600(f: TextIO):
+
+def parse_cmx3600(f: TextIO) -> EditList:
     """
     Parse a CMX 3600 EDL.
 
-    :param TextIO f: a file-like object, anything that's readlines-able.
+    :param TextIO f: a file-like object, an opened CMX 3600 .EDL file.
     :returns: An :class:`pycmx.edit_list.EditList`.
     """
     statements = parse_cmx3600_statements(f)
     return EditList(statements)
-    

pycmx/parse_cmx_statements.py

@@ -2,27 +2,28 @@
 # (c) 2018 Jamie Hardt
 
 import re
-import sys
 from collections import namedtuple
-from itertools import count
 from typing import TextIO, List
 
 
 from .util import collimate
 
-StmtTitle =     namedtuple("Title",["title","line_number"])
-StmtFCM =       namedtuple("FCM",["drop","line_number"])
-StmtEvent =     namedtuple("Event",["event","source","channels","trans",\
-        "trans_op","source_in","source_out","record_in","record_out","format","line_number"])
-StmtAudioExt =  namedtuple("AudioExt",["audio3","audio4","line_number"])
-StmtClipName =  namedtuple("ClipName",["name","affect","line_number"])
-StmtSourceFile = namedtuple("SourceFile",["filename","line_number"])
-StmtRemark =    namedtuple("Remark",["text","line_number"])
-StmtEffectsName = namedtuple("EffectsName",["name","line_number"])
-StmtSourceUMID =   namedtuple("Source",["name","umid","line_number"])
-StmtSplitEdit = namedtuple("SplitEdit",["video","magnitude", "line_number"])
-StmtMotionMemory = namedtuple("MotionMemory",["source","fps"]) # FIXME needs more fields
-StmtUnrecognized = namedtuple("Unrecognized",["content","line_number"])
+StmtTitle = namedtuple("Title", ["title", "line_number"])
+StmtFCM = namedtuple("FCM", ["drop", "line_number"])
+StmtEvent = namedtuple("Event", ["event", "source", "channels", "trans",
+                                 "trans_op", "source_in", "source_out",
+                                 "record_in", "record_out", "format",
+                                 "line_number"])
+StmtAudioExt = namedtuple("AudioExt", ["audio3", "audio4", "line_number"])
+StmtClipName = namedtuple("ClipName", ["name", "affect", "line_number"])
+StmtSourceFile = namedtuple("SourceFile", ["filename", "line_number"])
+StmtRemark = namedtuple("Remark", ["text", "line_number"])
+StmtEffectsName = namedtuple("EffectsName", ["name", "line_number"])
+StmtSourceUMID = namedtuple("Source", ["name", "umid", "line_number"])
+StmtSplitEdit = namedtuple("SplitEdit", ["video", "magnitude", "line_number"])
+StmtMotionMemory = namedtuple(
+    "MotionMemory", ["source", "fps"])  # FIXME needs more fields
+StmtUnrecognized = namedtuple("Unrecognized", ["content", "line_number"])
 
 
 def parse_cmx3600_statements(file: TextIO) -> List[object]:
@@ -30,76 +31,92 @@ def parse_cmx3600_statements(file: TextIO) -> List[object]:
     Return a list of every statement in the file argument.
     """
     lines = file.readlines()
-    line_numbers = count() 
-    return [_parse_cmx3600_line(line.strip(), line_number) \
-            for (line, line_number) in zip(lines,line_numbers)]
-    
-def _edl_column_widths(event_field_length, source_field_length):
-    return [event_field_length,2, source_field_length,1,
-                            4,2, # chans
-                            4,1, # trans
-                            3,1, # trans op
-                            11,1,
-                            11,1,
-                            11,1,
-                            11]
-
-def _edl_m2_column_widths():
-    return [2, # "M2"
-            3,3, #
-            8,8,1,4,2,1,4,13,3,1,1]
-
-
-def _parse_cmx3600_line(line, line_number):
-    long_event_num_p  = re.compile("^[0-9]{6} ")
+    return [_parse_cmx3600_line(line.strip(), line_number)
+            for (line_number, line) in enumerate(lines)]
+
+
+def _edl_column_widths(event_field_length, source_field_length) -> List[int]:
+    return [event_field_length, 2, source_field_length, 1,
+            4, 2,  # chans
+            4, 1,  # trans
+            3, 1,  # trans op
+            11, 1,
+            11, 1,
+            11, 1,
+            11]
+
+# def _edl_m2_column_widths():
+#     return [2, # "M2"
+#             3,3, #
+#             8,8,1,4,2,1,4,13,3,1,1]
+
+
+def _parse_cmx3600_line(line: str, line_number: int) -> object:
+    """
+    Parses a single CMX EDL line.
+
+    :param line: A single EDL line.
+    :param line_number: The index of this line in the file.
+    """
+    long_event_num_p = re.compile("^[0-9]{6} ")
     short_event_num_p = re.compile("^[0-9]{3} ")
-    
-    if isinstance(line,str):
-        if line.startswith("TITLE:"):
-            return _parse_title(line,line_number)
-        elif line.startswith("FCM:"):
-            return _parse_fcm(line, line_number)
-        elif long_event_num_p.match(line) != None:
-            length_file_128 = sum(_edl_column_widths(6,128))
-            if len(line) < length_file_128:
-                return _parse_long_standard_form(line, 32, line_number)
-            else:
-                return _parse_long_standard_form(line, 128, line_number)
-        elif short_event_num_p.match(line) != None:
-            return _parse_standard_form(line, line_number)
-        elif line.startswith("AUD"):
-            return _parse_extended_audio_channels(line,line_number)
-        elif line.startswith("*"):
-            return _parse_remark( line[1:].strip(), line_number)
-        elif line.startswith(">>> SOURCE"):
-            return _parse_source_umid_statement(line, line_number)
-        elif line.startswith("EFFECTS NAME IS"):
-            return _parse_effects_name(line, line_number)
-        elif line.startswith("SPLIT:"):
-            return _parse_split(line, line_number)
-        elif line.startswith("M2"):
-            return _parse_motion_memory(line, line_number)
+    x_event_form_p = re.compile("^([0-9]{4,5}) ")
+
+    if line.startswith("TITLE:"):
+        return _parse_title(line, line_number)
+    elif line.startswith("FCM:"):
+        return _parse_fcm(line, line_number)
+    elif long_event_num_p.match(line) is not None:
+        length_file_128 = sum(_edl_column_widths(6, 128))
+        if len(line) < length_file_128:
+            return _parse_long_standard_form(line, 32, line_number)
         else:
-            return _parse_unrecognized(line, line_number)
+            return _parse_long_standard_form(line, 128, line_number)
+    elif (m := x_event_form_p.match(line)) is not None:
+        assert m is not None
+        event_field_length = len(m[1])
+        return _parse_columns_for_standard_form(line, event_field_length,
+                                                8, line_number)
+    elif short_event_num_p.match(line) is not None:
+        return _parse_standard_form(line, line_number)
+    elif line.startswith("AUD"):
+        return _parse_extended_audio_channels(line, line_number)
+    elif line.startswith("*"):
+        return _parse_remark(line[1:].strip(), line_number)
+    elif line.startswith(">>> SOURCE"):
+        return _parse_source_umid_statement(line, line_number)
+    elif line.startswith("EFFECTS NAME IS"):
+        return _parse_effects_name(line, line_number)
+    elif line.startswith("SPLIT:"):
+        return _parse_split(line, line_number)
+    elif line.startswith("M2"):
+        return _parse_motion_memory(line, line_number)
+    else:
+        return _parse_unrecognized(line, line_number)
+
 
-    
-def _parse_title(line, line_num):
+def _parse_title(line, line_num) -> StmtTitle:
     title = line[6:].strip()
-    return StmtTitle(title=title,line_number=line_num)
+    return StmtTitle(title=title, line_number=line_num)
 
-def _parse_fcm(line, line_num):
+
+def _parse_fcm(line, line_num) -> StmtFCM:
     val = line[4:].strip()
     if val == "DROP FRAME":
-        return StmtFCM(drop= True, line_number=line_num)
+        return StmtFCM(drop=True, line_number=line_num)
     else:
-        return StmtFCM(drop= False, line_number=line_num)
+        return StmtFCM(drop=False, line_number=line_num)
+
+
+def _parse_long_standard_form(line, source_field_length, line_number):
+    return _parse_columns_for_standard_form(line, 6, source_field_length,
+                                            line_number)
+
 
-def _parse_long_standard_form(line,source_field_length, line_number):
-    return _parse_columns_for_standard_form(line, 6, source_field_length, line_number)
-    
 def _parse_standard_form(line, line_number):
     return _parse_columns_for_standard_form(line, 3, 8, line_number)
-    
+
+
 def _parse_extended_audio_channels(line, line_number):
     content = line.strip()
     if content == "AUD   3":
@@ -110,60 +127,67 @@ def _parse_extended_audio_channels(line, line_number):
         return StmtAudioExt(audio3=True, audio4=True, line_number=line_number)
     else:
         return StmtUnrecognized(content=line, line_number=line_number)
-    
+
+
 def _parse_remark(line, line_number) -> object:
     if line.startswith("FROM CLIP NAME:"):
-        return StmtClipName(name=line[15:].strip() , affect="from", line_number=line_number)
+        return StmtClipName(name=line[15:].strip(), affect="from",
+                            line_number=line_number)
     elif line.startswith("TO CLIP NAME:"):
-        return StmtClipName(name=line[13:].strip(), affect="to", line_number=line_number)
+        return StmtClipName(name=line[13:].strip(), affect="to",
+                            line_number=line_number)
     elif line.startswith("SOURCE FILE:"):
-        return StmtSourceFile(filename=line[12:].strip() , line_number=line_number)
+        return StmtSourceFile(filename=line[12:].strip(),
+                              line_number=line_number)
     else:
         return StmtRemark(text=line, line_number=line_number)
 
+
 def _parse_effects_name(line, line_number) -> StmtEffectsName:
     name = line[16:].strip()
     return StmtEffectsName(name=name, line_number=line_number)
 
+
 def _parse_split(line, line_number):
     split_type = line[10:21]
     is_video = False
     if split_type.startswith("VIDEO"):
         is_video = True
 
-    split_mag  = line[24:35]
-    return StmtSplitEdit(video=is_video, magnitude=split_mag, line_number=line_number)
+    split_mag = line[24:35]
+    return StmtSplitEdit(video=is_video, magnitude=split_mag,
+                         line_number=line_number)
 
 
 def _parse_motion_memory(line, line_number):
-    return StmtMotionMemory(source = "", fps="")
+    return StmtMotionMemory(source="", fps="")
 
 
 def _parse_unrecognized(line, line_number):
     return StmtUnrecognized(content=line, line_number=line_number)
 
-def _parse_columns_for_standard_form(line, event_field_length, source_field_length, line_number):
+
+def _parse_columns_for_standard_form(line, event_field_length,
+                                     source_field_length, line_number):
     col_widths = _edl_column_widths(event_field_length, source_field_length)
-    
+
     if sum(col_widths) > len(line):
         return StmtUnrecognized(content=line, line_number=line_number)
-    
-    column_strings = collimate(line,col_widths)
-        
-    return StmtEvent(event=column_strings[0], 
-                    source=column_strings[2].strip(), 
-                    channels=column_strings[4].strip(),
-                    trans=column_strings[6].strip(),
+
+    column_strings = collimate(line, col_widths)
+
+    return StmtEvent(event=column_strings[0],
+                     source=column_strings[2].strip(),
+                     channels=column_strings[4].strip(),
+                     trans=column_strings[6].strip(),
                      trans_op=column_strings[8].strip(),
                      source_in=column_strings[10].strip(),
                      source_out=column_strings[12].strip(),
                      record_in=column_strings[14].strip(),
                      record_out=column_strings[16].strip(),
-		    line_number=line_number,
-                    format=source_field_length)
+                     line_number=line_number, format=source_field_length)
 
 
 def _parse_source_umid_statement(line, line_number):
-    trimmed = line[3:].strip()
+    # trimmed = line[3:].strip()
     return StmtSourceUMID(name=None, umid=None, line_number=line_number)
-

pycmx/transition.py

@@ -3,11 +3,12 @@
 
 from typing import Optional
 
+
 class Transition:
     """
     A CMX transition: a wipe, dissolve or cut.
     """
-    
+
     Cut = "C"
     Dissolve = "D"
     Wipe = "W"
@@ -41,7 +42,7 @@ class Transition:
     @property
     def cut(self) -> bool:
         "`True` if this transition is a cut."
-        return self.transition == 'C' 
+        return self.transition == 'C'
 
     @property
     def dissolve(self) -> bool:
@@ -56,7 +57,7 @@ class Transition:
     @property
     def effect_duration(self) -> int:
         """The duration of this transition, in frames of the record target.
-        
+
         In the event of a key event, this is the duration of the fade in.
         """
         return int(self.operand)
@@ -86,5 +87,3 @@ class Transition:
         the key foreground and replaced with the key background.
         """
         return self.transition == Transition.KeyOut
-
-

pycmx/util.py

@@ -3,29 +3,28 @@
 
 # Utility functions
 
-def collimate(a_string, column_widths): 
+def collimate(a_string, column_widths):
     """
-    Split a list-type thing, like a string, into slices that are column_widths 
+    Split a list-type thing, like a string, into slices that are column_widths
     length.
-    
+
     >>> collimate("a b1 c2345",[2,3,3,2])
     ['a ','b1 ','c23','45']
 
     Args:
         a_string: The string to split. This parameter can actually be anything
             sliceable.
-        column_widths: A list of integers, each one is the length of a column. 
+        column_widths: A list of integers, each one is the length of a column.
 
     Returns:
-        A list of slices. The len() of the returned list will *always* equal 
-        len(:column_widths:). 
+        A list of slices. The len() of the returned list will *always* equal
+        len(:column_widths:).
     """
-    
+
     if len(column_widths) == 0:
         return []
-    
+
     width = column_widths[0]
     element = a_string[:width]
     rest = a_string[width:]
-    return [element] + collimate(rest, column_widths[1:]) 
-
+    return [element] + collimate(rest, column_widths[1:])

pycmx-1.3.0.dist-info/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2022 Jamie Hardt.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{pycmx-1.2.2.dist-info → pycmx-1.3.0.dist-info}/METADATA

@@ -1,29 +1,32 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pycmx
-Version: 1.2.2
-Summary: pycmx is a parser for CMX 3600-style EDLs.
+Version: 1.3.0
+Summary: Python CMX 3600 Edit Decision List Parser
+Home-page: https://github.com/iluvcapra/pycmx
+License: MIT
 Keywords: parser,film,broadcast
-Author-email: Jamie Hardt <jamiehardt@me.com>
-Requires-Python: ~=3.7
-Description-Content-Type: text/markdown
+Author: Jamie Hardt
+Author-email: jamiehardt@me.com
+Requires-Python: >=3.8,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Topic :: Multimedia
-Classifier: Topic :: Multimedia :: Video
-Classifier: Topic :: Text Processing
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: sphinx >= 5.3.0 ; extra == "doc"
-Requires-Dist: sphinx_rtd_theme >= 1.1.1 ; extra == "doc"
-Project-URL: Documentation, https://pycmx.readthedocs.io/
-Project-URL: Home, https://github.com/iluvcapra/pycmx
-Project-URL: Issues, https://github.com/iluvcapra/pycmx/issues
-Project-URL: Source, https://github.com/iluvcapra/pycmx.git
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Multimedia
+Classifier: Topic :: Multimedia :: Video
+Classifier: Topic :: Text Processing
 Provides-Extra: doc
+Requires-Dist: sphinx (>=5.3.0) ; extra == "doc"
+Requires-Dist: sphinx_rtd_theme (>=1.1.1) ; extra == "doc"
+Project-URL: Documentation, https://pycmx.readthedocs.io/
+Project-URL: Repository, https://github.com/iluvcapra/pycmx.git
+Project-URL: Tracker, https://github.com/iluvcapra/pycmx/issues
+Description-Content-Type: text/markdown
 
 [![Documentation Status](https://readthedocs.org/projects/pycmx/badge/?version=latest)](https://pycmx.readthedocs.io/en/latest/?badge=latest) ![](https://img.shields.io/github/license/iluvcapra/pycmx.svg) ![](https://img.shields.io/pypi/pyversions/pycmx.svg) [![](https://img.shields.io/pypi/v/pycmx.svg)](https://pypi.org/project/pycmx/) ![](https://img.shields.io/pypi/wheel/pycmx.svg)
 ![GitHub last commit](https://img.shields.io/github/last-commit/iluvcapra/pycmx)
@@ -32,12 +35,14 @@ Provides-Extra: doc
 
 # pycmx
 
-The `pycmx` package provides a basic interface for parsing a CMX 3600 EDL and its most most common variations.
+The `pycmx` package provides a basic interface for parsing a CMX 3600 EDL and 
+its most most common variations.
 
 ## Features
 
-* The major variations of the CMX 3600: the standard, "File32" and "File128" 
-  formats are automatically detected and properly read.
+* The major variations of the CMX 3600: the standard, "File32", "File128" and 
+  long Adobe Premiere event numbers are automatically detected and properly
+  read.
 * Preserves relationship between events and individual edits/clips.
 * Remark or comment fields with common recognized forms are read and 
   available to the client, including clip name and source file data.
@@ -111,5 +116,3 @@ Audio channel 7 is present
 False
 ```
 
-
-

pycmx-1.3.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+pycmx/__init__.py,sha256=u_VU3f3WltGoZzg_iZBLQZUtFqGFVZgBX3trqM7v3D4,365
+pycmx/channel_map.py,sha256=vkGonW2CY5F_TCbcJm9jFp6O7JsNUW4hew5q8KiVWLo,3169
+pycmx/edit.py,sha256=6AfQAHh8f4aRFs211d2-Jmkv-a8CmoIduOFL3N2lrQg,3893
+pycmx/edit_list.py,sha256=hjOsCxrGwQemjpmUGdfnJa0_rSYs-LSYkfOrjlqU-gw,3170
+pycmx/event.py,sha256=6fwbCjo1mX8Zkmbd6Maw4-msWm2zYCUGRIGSeqfFWdw,3809
+pycmx/parse_cmx_events.py,sha256=9d0jCvOXCt1RPSEBLZhLScSsGq3oDVa2bBDar8x4j5U,477
+pycmx/parse_cmx_statements.py,sha256=Wi0wjlJsphR3WXWXcJn7fPRDKANitZpQwvOSZ84HY2A,7242
+pycmx/transition.py,sha256=IlVz2X3Z7CttJccqzzjhPPUNY2Pe8ZmVMIBnCrVLIG0,2364
+pycmx/util.py,sha256=z1QYA4qUxiaCeKPhCQEmgIyhr5MHxSknW2xjl6qs1kA,782
+pycmx-1.3.0.dist-info/LICENSE,sha256=JS087ZFloGaV7LHygeUaXmT-fGLx0VF30W62wDTLRCc,1056
+pycmx-1.3.0.dist-info/METADATA,sha256=drKnB4Am-o2JUh_dFsDItdFV5JQYarvgOfl88icsBKY,4027
+pycmx-1.3.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+pycmx-1.3.0.dist-info/RECORD,,

{pycmx-1.2.2.dist-info → pycmx-1.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any

pycmx-1.2.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-pycmx/__init__.py,sha256=yS4sYKFfw3ScPaCr0_g0qSmhhZRxOLkgwR5kQ9nxYnc,388
-pycmx/channel_map.py,sha256=M7P3b0S2cBrmQjfSP5sixFxGv_uBjvie0f9PVdy9cMI,3248
-pycmx/edit.py,sha256=sipPmT2W0hPoYyRyZzwohohjO1fqwEU_mxsQheZxWC0,3775
-pycmx/edit_list.py,sha256=zZaOTEPgubHxetQF01BhMf6d097jXjvohYrMXtbP1a4,3172
-pycmx/event.py,sha256=-wlOdOwOVVk_4Wus0D8PVxRiEPBv1XZrRiQwkoRIOY4,3781
-pycmx/parse_cmx_events.py,sha256=_KeowR6jm4LlFWtejgZ0SL5jX-sMu8GKgx7ferUuRbE,472
-pycmx/parse_cmx_statements.py,sha256=UqS-p1kAFR8cp1pgiiBZLlyIhF-8hOWykYIS6-JuEBg,6755
-pycmx/transition.py,sha256=fAbWMqBZmZIcpZUobTlYuTd4WxercHMik_zqp7yK4mA,2378
-pycmx/util.py,sha256=alnJaV9vqH-KGtExrWjBiYMTiTILDXnF8Ju0sXWa69A,801
-pycmx-1.2.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-pycmx-1.2.2.dist-info/METADATA,sha256=WbFuxIxB-PIjdcqaQtdsT597a9gWlZR54hSXktzPcrI,3928
-pycmx-1.2.2.dist-info/RECORD,,