Nudged version

Updated python-publish to latest version

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+per-file-ignores =
+    pycmx/__init__.py: F401
+    tests/__init__.py: F401
+    

.github/workflows/bsky_test.yml

@@ -0,0 +1,25 @@
+name: Test Post to Bluesky
+
+on:
+  workflow_dispatch:
+    
+# permissions:
+#   contents: read
+#   id-token: write
+  
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+    steps:
+    - name: Send Bluesky Post
+      uses: myConsciousness/bluesky-post@v5
+      with:
+        text: |
+          This is a test post!
+        link-preview-url: ${{ github.server_url }}/${{ github.repository }}
+        identifier: ${{ secrets.BLUESKY_APP_USER }}  
+        password: ${{ secrets.BLUESKY_APP_PASSWORD }}
+        service: bsky.social    
+        retry-count: 1

.github/workflows/python-package.yml

@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Lint and Test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4.3.0
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        python -m pip install -e .
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --count --max-line-length=79 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

.github/workflows/pythonpublish.yml

@@ -0,0 +1,42 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+    
+permissions:
+  contents: read
+  id-token: write
+  
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Set up Python
+      uses: actions/setup-python@v5.3.0
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Build package
+      run: python -m build .
+    - name: Publish to Pypi
+      uses: pypa/gh-action-pypi-publish@v1.13.0
+      with:
+        password: ${{ secrets.PYPI_APIKEY }}
+    - name: Send Bluesky Post
+      uses: myConsciousness/bluesky-post@v5
+      with:
+        text: |
+          I've released a new version of pycmx, my python module for 
+          reading CMX EDLs.
+        link-preview-url: ${{ github.server_url }}/${{ github.repository }}
+        identifier: ${{ secrets.BLUESKY_APP_USER }}  
+        password: ${{ secrets.BLUESKY_APP_PASSWORD }}
+        service: bsky.social    
+        retry-count: 1

.gitignore

@@ -7,3 +7,16 @@
 # Python egg metadata, regenerated from source files by setuptools.
 /*.egg-info
 /build/
+
+# Vim Swapfiles
+*.swp
+.DS_Store
+
+venv/
+
+.coverage
+lcov.info
+
+
+# venv
+venv/

.readthedocs.yaml

@@ -0,0 +1,32 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.10"
+    # You can also specify other tool versions:
+    # nodejs: "16"
+    # rust: "1.55"
+    # golang: "1.17"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/source/conf.py
+
+#If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+   - pdf
+
+#Optionally declare the Python requirements required to build your docs
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc

CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# Contributing
+
+Contributions to this project are welcome!
+
+The best way to contribute code to this project is to find this project on [Github][github] and submit a pull request.
+
+## Call for EDLs
+
+If you have EDLs you are having trouble working with becuase of unusual formatting, please send me a copy! Contact us
+through [Github].
+
+
+[github]: https://github.com/iluvcapra/pycmx

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Jamie Hardt.
+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

README.md

@@ -1,60 +1,87 @@
+[![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)
+[![Lint and Test](https://github.com/iluvcapra/pycmx/actions/workflows/python-package.yml/badge.svg)](https://github.com/iluvcapra/pycmx/actions/workflows/python-package.yml)
+
+
 # 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 CMX3600, the standard, "File32" and "File128" 
+* The major variations of the CMX 3600: the standard, "File32", "File128" and 
-  formats are automatically detected and properly read.
+  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.
+* Symbolically decodes transitions and audio channels.
+* Does not parse or validate timecodes, does not enforce framerates, does not
+  parameterize timecode or framerates in any way. This makes the parser more
+  tolerant of EDLs with mixed rates.
+* Unrecognized lines are accessible on the `EditList` and `Event` classes
+  along with the line numbers, to help the client diagnose problems with a
+  list and give the client the ability to extend the package with their own
+  parsing code.
 
 ## Usage
 
+### Opening and Parsing EDL Files
 ```
-import pycmx
+>>> import pycmx
-pycmx.parse_cmx3600("INS4_R1_010417.edl") 
+>>> with open("tests/edls/TEST.edl") as f
-print(events[5:8])
+... 	edl = pycmx.parse_cmx3600(f)
->>> [CmxEvent(title='INS4_R1_010417', number='000006', 
+...
-       clip_name='V1A-6A', source_name='A192C008_160909_R1BY', 
+>>> edl.title
-       channels=CmxChannelMap(v=True,a1=False,a2=False,a3=False,a4=False), 
+'DC7 R1_v8.2'
-       source_start='19:26:38:13', source_finish='19:27:12:03', 
-       record_start='01:00:57:15', record_finish='01:01:31:05', 
-       fcm_drop=False), 
-     CmxEvent(title='INS4_R1_010417', number='000007', 
-        clip_name='1-4A', source_name='A188C004_160908_R1BY', 
-        channels=CmxChannelMap(v=True,a1=False,a2=False,a3=False,a4=False), 
-        source_start='19:29:48:01', source_finish='19:30:01:00', 
-        record_start='01:01:31:05', record_finish='01:01:44:04', 
-        fcm_drop=False), 
-     CmxEvent(title='INS4_R1_010417', number='000008', 
-        clip_name='2G-3', source_name='A056C007_160819_R1BY', 
-        channels=CmxChannelMap(v=True,a1=False,a2=False,a3=False,a4=False), 
-        source_start='19:56:27:14', source_finish='19:56:41:00', 
-        record_start='01:01:44:04', record_finish='01:01:57:14', 
-        fcm_drop=False)]
 ```
 
-## Known Issues/Roadmap
+### Reading Events and Edits
 
-To be addressed:
+`EditList.events` is a generator...
-* Does not decode transitions.
-* Does not decode "M2" speed changes.
-* Does not decode repair notes, audio notes or other Avid-specific notes.
 
-May not be addressed:
+```
+>>> events = list( edl.events )  
+>>> len(events)
+120
+>>> events[43].number 
+'044'
+```
 
-* Does not parse source list at end of EDL.
+...and events contain 1...n edits.
 
-Probably beyond the scope of this module:
+```
-* Does not parse timecode entries.
+>>> events[43].edits[0].source_in 
-* Does not parse color correction notes. For this functionality we refer you to [pycdl](https://pypi.org/project/pycdl/) or [cdl-convert](https://pypi.org/project/cdl-convert/).
+'00:00:00:00'
+>>> events[43].edits[0].transition.cut
+True
+>>> events[43].edits[0].record_out
+'01:10:21:10'
+```
 
-## Should I Use This?
+### Acessing Transitions and Enabled Channels
 
-At this time, this is (at best) alpha software and the interface will be 
+```           
-changing often. It may be fun to experiment with but it is not suitable
+>>> events[41].edits[0].transition.dissolve
-at this time for production code.
+False
+>>> events[41].edits[1].transition.dissolve
+True
+>>> events[41].edits[0].clip_name
+'TC R1 V1.2 TEMP1 DX M.WAV'
+>>> events[41].edits[1].clip_name
+'TC R1 V6 TEMP2 M DX.WAV'
    
-Contributions are welcome and will make this module production-ready all the
+              # parsed channel maps are also
-faster! Please reach out or file a ticket! 
+              # available to the client
+>>> events[2].edits[0].channels.get_audio_channel(7)
+True
+>>> events[2].edits[0].channels.get_audio_channel(6)
+False
+>>> for c in events[2].edits[0].channels.channels:
+...     print(f"Audio channel {c} is present")
+... 
+Audio channel 7 is present
+>>> events[2].edits[0].channels.video
+False
+```

bin/edl2scenelist.py

@@ -0,0 +1,112 @@
+import pycmx
+import re
+import argparse
+import sys
+
+import logging
+
+
+FORMAT = '%(asctime)-15s %(message)s'
+logging.basicConfig(format=FORMAT)
+
+
+log = logging.getLogger(__name__)
+
+
+def all_video_edits(edl):
+    for event in edl.events:
+        for edit in event.edits:
+            if edit.channels.video:
+                yield edit
+
+
+def get_scene_name(edit, pattern):
+    scene_extractor = re.compile(pattern, re.I)
+    if edit.clip_name is None:
+        return None
+    else:
+        match_data = re.match(scene_extractor, edit.clip_name)
+        if match_data:
+            return match_data[1]
+        else:
+            return edit.clip_name
+
+
+def output_cmx(outfile, out_list):
+    outfile.write("TITLE:  SCENE LIST\r\n")
+    outfile.write("FCM: NON-DROP FRAME\r\n")
+
+    for i, o in enumerate(out_list):
+        line = '%03i  AX       V     C        ' % (i)
+        line += '00:00:00:00 00:00:00:00 %s %s\r\n' % (o['start'], o['end'])
+        outfile.write(line)
+        outfile.write("* FROM CLIP NAME: %s\r\n" % (o['scene']))
+
+
+def output_cols(outfile, out_list):
+    for o in out_list:
+        outfile.write("%-12s\t%-12s\t%s\n" %
+                      (o['start'], o['end'], o['scene']))
+
+
+def scene_list(infile, outfile, out_format, pattern):
+
+    edl = pycmx.parse_cmx3600(infile)
+
+    current_scene_name = None
+
+    grouped_edits = []
+
+    for edit in all_video_edits(edl):
+        this_scene_name = get_scene_name(edit, pattern)
+        if this_scene_name is not None:
+            if current_scene_name != this_scene_name:
+                grouped_edits.append([])
+                current_scene_name = this_scene_name
+
+            grouped_edits[-1].append(edit)
+
+    out_list = []
+    for group in grouped_edits:
+        out_list.append({
+            'start': group[0].record_in,
+            'end': group[-1].record_out,
+            'scene': get_scene_name(group[0], pattern)}
+        )
+
+    if out_format == 'cmx':
+        output_cmx(outfile, out_list)
+    if out_format == 'cols':
+        output_cols(outfile, out_list)
+    else:
+        log.warning(f"Format {out_format} unrecognized. Will use cmx.\n")
+        output_cmx(outfile, out_list)
+
+
+def scene_list_cli():
+    parser = argparse.ArgumentParser(
+        description='Read video events from an input CMX EDL and output '
+        'events merged into scenes.')
+    parser.add_argument('-o', '--outfile', default=sys.stdout,
+                        type=argparse.FileType('w'),
+                        help='Output file. Default is stdout.')
+    parser.add_argument('-f', '--format', default='cmx', type=str,
+                        help='Output format. Options are cols and cmx, cmx '
+                        'is the default.')
+    parser.add_argument('-p', '--pattern', default='V?([A-Z]*[0-9]+)',
+                        help='RE pattern for extracting scene name from clip '
+                        'name. The default is "V?([A-Z]*[0-9]+)". ' +
+                        'This pattern will be matched case-insensitively.')
+    parser.add_argument('input_edl', default=sys.stdin,
+                        type=argparse.FileType('r'), nargs='?',
+                        help='Input file. Default is stdin.')
+    args = parser.parse_args()
+
+    infile = args.input_edl
+
+    scene_list(infile=infile, outfile=args.outfile,
+               out_format=args.format, pattern=args.pattern)
+
+
+if __name__ == '__main__':
+    scene_list_cli()

docs/.buildinfo

@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 9f647f525db0c82aadec132928a40ec5
+tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/.gitignore

@@ -0,0 +1 @@
+build/*

docs/Makefile

@@ -0,0 +1,19 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/source/classes.rst

@@ -0,0 +1,24 @@
+pycmx Classes
+=============
+
+.. autoclass:: pycmx.edit_list.EditList 
+   :members:
+
+
+.. autoclass:: pycmx.event.Event 
+   :members:
+
+
+.. autoclass:: pycmx.edit.Edit  
+   :members:
+
+
+.. autoclass:: pycmx.transition.Transition
+   :members:
+
+
+.. autoclass:: pycmx.channel_map.ChannelMap
+   :members:
+
+
+

docs/source/conf.py

@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import importlib
+import os
+import sys
+sys.path.insert(0, os.path.abspath('../..'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = u'pycmx'
+copyright = u'(c) 2025, Jamie Hardt'
+author = u'Jamie Hardt'
+
+release = importlib.metadata.version("pycmx")
+version = release
+# The short X.Y version
+# The full version, including alpha/beta/rc tags
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.githubpages',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'em'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = None
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'sphinx_rtd_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+html_theme_options = {'collapse_navigation': False}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'pycmxdoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'pycmx.tex', u'pycmx Documentation',
+     u'Jamie Hardt', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'pycmx', u'pycmx Documentation',
+     [author], "3p")
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'pycmx', u'pycmx Documentation',
+     author, 'pycmx', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+
+# -- Extension configuration -------------------------------------------------
+
+# -- Options for todo extension ----------------------------------------------
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True

docs/source/function.rst

@@ -0,0 +1,7 @@
+Parse Function
+==============
+
+
+.. autofunction:: pycmx.parse_cmx_events.parse_cmx3600
+
+

docs/source/index.rst

@@ -0,0 +1,20 @@
+.. pycmx documentation master file, created by
+   sphinx-quickstart on Wed Dec 26 21:51:43 2018.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to pycmx's documentation!
+=================================
+
+.. toctree::
+   :maxdepth: 5
+   :caption: API Reference
+
+   function
+   classes
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`

pycmx/__init__.py

@@ -1,3 +1,13 @@
-# pycmx init
+# -*- coding: utf-8 -*-
+"""
+pycmx is a parser for CMX 3600-style EDLs.
 
-from .parse_cmx import parse_cmx3600
+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.
+"""
+
+from .parse_cmx_events import parse_cmx3600
+from .transition import Transition
+from .event import Event
+from .edit import Edit

pycmx/channel_map.py

@@ -0,0 +1,113 @@
+# pycmx
+# (c) 2018 Jamie Hardt
+
+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)
+    }
+
+    def __init__(self, v=False, audio_channels=set()):
+        self._audio_channel_set = audio_channels
+        self.v = v
+
+    @property
+    def video(self) -> bool:
+        'True if video is included'
+        return self.v
+
+    @property
+    def audio(self) -> bool:
+        'True if an audio channel is included'
+        return len(self._audio_channel_set) > 0
+
+    @property
+    def channels(self) -> Generator[int, None, None]:
+        'A generator for each audio channel'
+        for c in self._audio_channel_set:
+            yield c
+
+    @property
+    def a1(self) -> bool:
+        """True if A1 is included"""
+        return self.get_audio_channel(1)
+
+    @a1.setter
+    def a1(self, val: bool):
+        self.set_audio_channel(1, val)
+
+    @property
+    def a2(self) -> bool:
+        """True if A2 is included"""
+        return self.get_audio_channel(2)
+
+    @a2.setter
+    def a2(self, val: bool):
+        self.set_audio_channel(2, val)
+
+    @property
+    def a3(self) -> bool:
+        """True if A3 is included"""
+        return self.get_audio_channel(3)
+
+    @a3.setter
+    def a3(self, val: bool):
+        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 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):
+        """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:
+            channels = self._chan_map[event_str]
+            self.v = channels[0]
+            self.a1 = channels[1]
+            self.a2 = channels[2]
+        else:
+            matchresult = match(alt_channel_re, event_str)
+            if matchresult:
+                self.set_audio_channel(int(matchresult.group(1)), True)
+
+    def _append_ext(self, audio_ext):
+        self.a3 = audio_ext.audio3
+        self.a4 = audio_ext.audio4
+
+    def __or__(self, other):
+        """
+        the logical union of this channel map with another
+        """
+        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)

pycmx/cmx_event.py

@@ -1,17 +0,0 @@
-class CmxEvent:
-    def __init__(self,title,number,clip_name,source_name,channels,source_start,source_finish,
-            record_start, record_finish, fcm_drop, remarks = [] , unrecognized = []):
-        self.title = title
-        self.number = number
-        self.clip_name = clip_name
-        self.source_name = source_name
-        self.channels = channels
-        self.source_start = source_start
-        self.source_finish = source_finish
-        self.record_start = record_start
-        self.record_finish = record_finish
-        self.fcm_drop = fcm_drop
-        self.remarks = remarks
-        self.unrecgonized = unrecognized
-
-

pycmx/edit.py

@@ -0,0 +1,133 @@
+# pycmx
+# (c) 2018 Jamie Hardt
+
+from .transition import Transition
+from .channel_map import ChannelMap
+# from .parse_cmx_statements import StmtEffectsName
+
+from typing import Optional
+
+
+class Edit:
+    """
+    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):
+        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
+
+    @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
+        "TITLE:" record is line zero.
+        """
+        return self.edit_statement.line_number
+
+    @property
+    def channels(self) -> ChannelMap:
+        """
+        Get the :obj:`ChannelMap` object associated with this Edit.
+        """
+        cm = ChannelMap()
+        cm._append_event(self.edit_statement.channels)
+        if self.audio_ext is not None:
+            cm._append_ext(self.audio_ext)
+        return cm
+
+    @property
+    def transition(self) -> Transition:
+        """
+        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)
+        else:
+            return Transition(self.edit_statement.trans,
+                              self.edit_statement.trans_op, None)
+
+    @property
+    def source_in(self) -> str:
+        """
+        Get the source in timecode.
+        """
+        return self.edit_statement.source_in
+
+    @property
+    def source_out(self) -> str:
+        """
+        Get the source out timecode.
+        """
+
+        return self.edit_statement.source_out
+
+    @property
+    def record_in(self) -> str:
+        """
+        Get the record in timecode.
+        """
+
+        return self.edit_statement.record_in
+
+    @property
+    def record_out(self) -> str:
+        """
+        Get the record out timecode.
+        """
+
+        return self.edit_statement.record_out
+
+    @property
+    def source(self) -> str:
+        """
+        Get the source column. This is the 8, 32 or 128-character string on the
+        event record line, this usually references the tape name of the source.
+        """
+        return self.edit_statement.source
+
+    @property
+    def black(self) -> bool:
+        """
+        Black video or silence should be used as the source for this event.
+        """
+        return self.source == "BL"
+
+    @property
+    def aux_source(self) -> bool:
+        """
+        An auxiliary source is the source of this event.
+        """
+        return self.source == "AX"
+
+    @property
+    def source_file(self) -> Optional[str]:
+        """
+        Get the source file, as attested by a "* SOURCE FILE" remark on the
+        EDL. This will return None if the information is not present.
+        """
+        if self.source_file_statement is None:
+            return None
+        else:
+            return self.source_file_statement.filename
+
+    @property
+    def clip_name(self) -> Optional[str]:
+        """
+        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.
+        """
+        if self.clip_name_statement is None:
+            return None
+        else:
+            return self.clip_name_statement.name

pycmx/edit_list.py

@@ -0,0 +1,108 @@
+# pycmx
+# (c) 2018 Jamie Hardt
+
+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()`.
+    """
+
+    def __init__(self, statements):
+        self.title_statement = statements[0]
+        self.event_statements = statements[1:]
+
+    @property
+    def format(self) -> str:
+        """
+        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)
+
+        if first_event:
+            if first_event.format == 8:
+                return '3600'
+            elif first_event.format == 32:
+                return 'File32'
+            elif first_event.format == 128:
+                return 'File128'
+            else:
+                return 'unknown'
+        else:
+            return 'unknown'
+
+    @property
+    def channels(self) -> ChannelMap:
+        """
+        Return the union of every channel channel.
+        """
+
+        retval = ChannelMap()
+        for event in self.events:
+            for edit in event.edits:
+                retval = retval | edit.channels
+
+        return retval
+
+    @property
+    def title(self) -> str:
+        """
+        The title of this edit list.
+        """
+        return self.title_statement.title
+
+    @property
+    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'
+        current_event_num = None
+        event_statements = []
+        for stmt in self.event_statements:
+            if type(stmt) is StmtEvent:
+                if current_event_num is None:
+                    current_event_num = stmt.event
+                    event_statements.append(stmt)
+                else:
+                    if current_event_num != stmt.event:
+                        yield Event(statements=event_statements)
+                        event_statements = [stmt]
+                        current_event_num = stmt.event
+                    else:
+                        event_statements.append(stmt)
+
+            elif type(stmt) is StmtSourceUMID:
+                break
+            else:
+                event_statements.append(stmt)
+
+        yield Event(statements=event_statements)
+
+    @property
+    def sources(self) -> Generator[StmtSourceUMID, None, None]:
+        """
+        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

@@ -0,0 +1,108 @@
+# pycmx
+# (c) 2023 Jamie Hardt
+
+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. """
+
+    def __init__(self, statements):
+        self.statements = statements
+
+    @property
+    def number(self) -> int:
+        """
+        Return the event number.
+        """
+        return int(self._edit_statements()[0].event)
+
+    @property
+    def edits(self) -> List[Edit]:
+        """
+        Returns the edits. Most events will have a single edit, a single 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()
+
+        the_zip: List[List[Any]] = [edits_audio]
+
+        if len(edits_audio) == 2:
+            start_name: Optional[StmtClipName] = None
+            end_name: Optional[StmtClipName] = None
+
+            for clip_name in clip_names:
+                if clip_name.affect == 'from':
+                    start_name = clip_name
+                elif clip_name.affect == 'to':
+                    end_name = clip_name
+
+            the_zip.append([start_name, end_name])
+        else:
+            if len(edits_audio) == len(clip_names):
+                the_zip.append(clip_names)
+            else:
+                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))
+        else:
+            the_zip.append([None] * len(edits_audio))
+
+        # attach trans name to last event
+        try:
+            trans_statement = self._trans_name_statements()[0]
+            trans_names: List[Optional[Any]] = [None] * (len(edits_audio) - 1)
+            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)]
+
+    @property
+    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]
+
+    def _edit_statements(self) -> List[StmtEvent]:
+        return [s for s in self.statements if type(s) is StmtEvent]
+
+    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]:
+        for (s1, s2) in zip(self.statements, self.statements[1:]):
+            if type(s1) is StmtEvent and type(s2) is StmtAudioExt:
+                yield (s1, s2)
+            elif type(s1) is StmtEvent:
+                yield (s1, None)

pycmx/parse_cmx.py

@@ -1,183 +0,0 @@
-# pycmx
-# (c) 2018 Jamie Hardt
-
-from .parse_cmx_statements import parse_cmx3600_statements
-from collections import namedtuple
-
-from re import compile, match
-
-class NamedTupleParser:
-    
-    def __init__(self, tuple_list):
-        self.tokens = tuple_list
-        self.current_token = None
-    
-    def peek(self):
-        return self.tokens[0]
-    
-    def at_end(self):
-        return len(self.tokens) == 0
-    
-    def next_token(self):
-        self.current_token = self.peek()
-        self.tokens = self.tokens[1:]        
-    
-    def accept(self, type_name):
-        if self.at_end(): 
-            return False
-        elif (type(self.peek()).__name__ == type_name ):
-            self.next_token()
-            return True
-        else:
-            return False
-    
-    def expect(self, type_name):
-        assert( self.accept(type_name) )
-
-
-class CmxChannelMap:
-    """
-    Represents a set of all the channels to which an event applies.
-    """
-
-    chan_map = {     "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.v = v
-
-    @property
-    def a1(self):
-        return self.get_audio_channel(1)
-
-    @a1.setter
-    def a1(self,val):
-        self.set_audio_channel(1,val)
-
-    @property
-    def a2(self):
-        return self.get_audio_channel(2)
-
-    @a2.setter
-    def a2(self,val):
-        self.set_audio_channel(2,val)
-
-    @property
-    def a3(self):
-        return self.get_audio_channel(3)
-
-    @a3.setter
-    def a3(self,val):
-        self.set_audio_channel(3,val)
-    
-    @property
-    def a4(self):
-        return self.get_audio_channel(4)
-
-    @a4.setter
-    def a4(self,val):
-        self.set_audio_channel(4,val)
-
-
-    def get_audio_channel(self,chan_num):
-        return (chan_num in self._audio_channel_set)
-
-    def set_audio_channel(self,chan_num,enabled):
-        if enabled:
-            self._audio_channel_set.add(chan_num)
-        elif self.get_audio_channel(chan_num):
-            self._audio_channel_set.remove(chan_num)
-            
-
-    def appendEvent(self, event_str):
-        alt_channel_re = compile('^A(\d+)')
-        if event_str in self.chan_map:
-            channels = self.chan_map[event_str]
-            self.v = channels[0]
-            self.a1 = channels[1]
-            self.a2 = channels[2]
-        else:
-            matchresult = match(alt_channel_re, event_str)
-            if matchresult:
-                self.set_audio_channel(int( matchresult.group(1)), True )
-
-            
-
-
-    def appendExt(self, audio_ext):
-        self.a3 = ext.audio3
-        self.a4 = ext.audio4
-
-    def __repr__(self):
-        return "CmxChannelMap(v="+ self.v.__repr__( ) + \
-                ",a1=" + self.a1.__repr__() + \
-                ",a2=" + self.a2.__repr__() + \
-                ",a3=" + self.a3.__repr__() + \
-                ",a4=" + self.a4.__repr__() +")"
-        
-            
-def parse_cmx3600(file):
-    """Accepts the path to a CMX EDL and returns a list of all events contained therein."""
-    statements = parse_cmx3600_statements(file)
-    parser = NamedTupleParser(statements)
-    parser.expect('Title')
-    title = parser.current_token.title
-    return event_list(title, parser)
-   
-
-CmxEvent = namedtuple('CmxEvent',['title','number','clip_name',
-    'source_name','channels','source_start','source_finish','record_start',
-    'record_finish','fcm_drop'])
-
-
-def event_list(title, parser):
-    state = {"fcm_drop" : False}
-
-    events_result = []
-    this_event = None
-    
-    while not parser.at_end():
-        if parser.accept('FCM'):
-            state['fcm_drop'] = parser.current_token.drop
-        elif parser.accept('Event'):
-            if this_event != None:
-                event_t = CmxEvent(**this_event)
-                events_result.append(event_t)
-
-            raw_event = parser.current_token
-            channels = CmxChannelMap({})
-            channels.appendEvent(raw_event.channels)
-
-            this_event = {'title': title, 'number': raw_event.event, 'clip_name': None ,
-                                            'source_name': raw_event.source, 
-                                            'channels': channels,
-                                            'source_start': raw_event.source_in,
-                                            'source_finish': raw_event.source_out,
-                                            'record_start': raw_event.record_in,
-                                            'record_finish': raw_event.record_out,
-                                            'fcm_drop': state['fcm_drop']}
-        elif parser.accept('AudioExt'):
-            this_event['channels'].appendExt(parser.current_token)
-        elif parser.accept('ClipName'):
-            this_event['clip_name'] = parser.current_token.name
-        elif parser.accept('SourceFile'):
-            this_event['source_name'] = parser.current_token.filename
-        elif parser.accept('Trailer'):
-            break
-        else:
-            parser.next_token()
-    
-    if this_event != None:
-        event_t = CmxEvent(**this_event)
-        events_result.append(event_t)
-
-    return events_result
-

pycmx/parse_cmx_events.py

@@ -0,0 +1,20 @@
+# pycmx
+# (c) 2018 Jamie Hardt
+
+# from collections import namedtuple
+
+from .parse_cmx_statements import (parse_cmx3600_statements)
+from .edit_list import EditList
+
+from typing import TextIO
+
+
+def parse_cmx3600(f: TextIO) -> EditList:
+    """
+    Parse a CMX 3600 EDL.
+
+    :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

@@ -1,126 +1,174 @@
+# pycmx
+# (c) 2018 Jamie Hardt
+
+import re
+from collections import namedtuple
+from typing import TextIO, List
 
-# Parsed Statement Data Structures
-# 
-# These represent individual lines that have been typed and have undergone some light symbolic parsing.
 
 from .util import collimate
-import re
+
-import sys
+StmtTitle = namedtuple("Title", ["title", "line_number"])
-from collections import namedtuple
+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"])
+def parse_cmx3600_statements(file: TextIO) -> List[object]:
-StmtFCM = namedtuple("FCM",["drop"])
+    """
-StmtEvent = namedtuple("Event",["event","source","channels","trans","trans_op","source_in","source_out","record_in","record_out"])
+    Return a list of every statement in the file argument.
-StmtAudioExt = namedtuple("AudioExt",["audio3","audio4"])
+    """
-StmtClipName = namedtuple("ClipName",["name"])
+    lines = file.readlines()
-StmtSourceFile = namedtuple("SourceFile",["filename"])
+    return [_parse_cmx3600_line(line.strip(), line_number)
-StmtRemark = namedtuple("Remark",["text"])
+            for (line_number, line) in enumerate(lines)]
-StmtTrailer = namedtuple("Trailer",["text"])
-StmtUnrecognized = namedtuple("Unrecognized",["content"])
 
 
-def parse_cmx3600_statements(path):
+def _edl_column_widths(event_field_length, source_field_length) -> List[int]:
-    with open(path,'r') as file:
+    return [event_field_length, 2, source_field_length, 1,
-        lines = file.readlines()
+            4, 2,  # chans
-        return [parse_cmx3600_line(line.strip()) for line in lines]
+            4, 1,  # trans
+            3, 1,  # trans op
+            11, 1,
+            11, 1,
+            11, 1,
+            11]
 
-def edl_column_widths(event_field_length, source_field_length):
+# def _edl_m2_column_widths():
-    return [event_field_length,2, source_field_length,1,
+#     return [2, # "M2"
-                            4,2, # chans
+#             3,3, #
-                            4,1, # trans
+#             8,8,1,4,2,1,4,13,3,1,1]
-                            3,1, # trans op
-                            11,1,
-                            11,1,
-                            11,1,
-                            11]
-    
-def parse_cmx3600_line(line):
-    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)
-        elif line.startswith("FCM:"):
-            return parse_fcm(line)
-        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)
-            else:
-                return parse_long_standard_form(line, 128)
-        elif short_event_num_p.match(line) != None:
-            return parse_standard_form(line)
-        elif line.startswith("AUD"):
-            return parse_extended_audio_channels(line)
-        elif line.startswith("*"):
-            return parse_remark( line[1:].strip())
-        elif line.startswith(">>>"):
-            return parse_trailer_statement(line)
-        else:
-            return parse_unrecognized(line)
 
 
-def parse_title(line):
+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.
+    """
+    event_num_p = re.compile(r"^(\d+)  ")
+    line_matcher = event_num_p.match(line)
+
+    if line.startswith("TITLE:"):
+        return _parse_title(line, line_number)
+    elif line.startswith("FCM:"):
+        return _parse_fcm(line, line_number)
+    elif line_matcher is not None:
+        event_field_len = len(line_matcher.group(1))
+        source_field_len = len(line) - (event_field_len + 65)
+        return _parse_columns_for_standard_form(line, event_field_len,
+                                                source_field_len, 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) -> StmtTitle:
     title = line[6:].strip()
-    return StmtTitle(title=title)
+    return StmtTitle(title=title, line_number=line_num)
 
-def parse_fcm(line):
+
+def _parse_fcm(line, line_num) -> StmtFCM:
     val = line[4:].strip()
     if val == "DROP FRAME":
-        return StmtFCM(drop= True)
+        return StmtFCM(drop=True, line_number=line_num)
     else:
-        return StmtFCM(drop= False)
+        return StmtFCM(drop=False, line_number=line_num)
 
-def parse_long_standard_form(line,source_field_length):
-    return parse_columns_for_standard_form(line, 6, source_field_length)
 
-def parse_standard_form(line):
+def _parse_extended_audio_channels(line, line_number):
-    return parse_columns_for_standard_form(line, 3, 8)
-    
-def parse_extended_audio_channels(line):
     content = line.strip()
-    if content == "AUD   3":
+    audio3 = True if "3" in content else False
-        return StmtAudioExt(audio3=True, audio4=False)
+    audio4 = True if "4" in content else False
-    elif content == "AUD   4":
-        return StmtAudioExt(audio3=False, audio4=True)
-    elif content == "AUD   3     4":
-        return StmtAudioExt(audio3=True, audio4=True)
-    else:
-        return StmtUnrecognized(content=line)
 
-def parse_remark(line):
+    if audio3 or audio4:
+        return StmtAudioExt(audio3, audio4, line_number)
+    else:
+        return StmtUnrecognized(line, line_number)
+
+
+def _parse_remark(line, line_number) -> object:
     if line.startswith("FROM CLIP NAME:"):
-        return StmtClipName(name=line[15:].strip() )
+        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)
     elif line.startswith("SOURCE FILE:"):
-        return StmtSourceFile(filename=line[12:].strip() )
+        return StmtSourceFile(filename=line[12:].strip(),
+                              line_number=line_number)
     else:
-        return StmtRemark(text=line)
+        return StmtRemark(text=line, line_number=line_number)
 
-def parse_unrecognized(line):
-    return StmtUnrecognized(content=line)
 
-def parse_columns_for_standard_form(line, event_field_length, source_field_length):
+def _parse_effects_name(line, line_number) -> StmtEffectsName:
-    col_widths = edl_column_widths(event_field_length, source_field_length)
+    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)
+
+
+def _parse_motion_memory(line, line_number):
+    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):
+    col_widths = _edl_column_widths(event_field_length, source_field_length)
 
     if sum(col_widths) > len(line):
-        return StmtUnrecognized(content=line)
+        return StmtUnrecognized(content=line, line_number=line_number)
 
-    column_strings = collimate(line,col_widths)
+    column_strings = collimate(line, col_widths)
 
     return StmtEvent(event=column_strings[0],
-                    source=column_strings[2].strip(), 
+                     source=column_strings[2].strip(),
-                    channels=column_strings[4].strip(),
+                     channels=column_strings[4].strip(),
-                    trans=column_strings[6].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())
+                     record_out=column_strings[16].strip(),
+                     line_number=line_number, format=source_field_length)
 
 
-def parse_trailer_statement(line):
+def _parse_source_umid_statement(line, line_number):
-    trimmed = line[3:].strip()
+    # trimmed = line[3:].strip()
-    return StmtTrailer(trimmed)
+    return StmtSourceUMID(name=None, umid=None, line_number=line_number)
-

pycmx/transition.py

@@ -0,0 +1,89 @@
+# pycmx
+# (c) 2023 Jamie Hardt
+
+from typing import Optional
+
+
+class Transition:
+    """
+    A CMX transition: a wipe, dissolve or cut.
+    """
+
+    Cut = "C"
+    Dissolve = "D"
+    Wipe = "W"
+    KeyBackground = "KB"
+    Key = "K"
+    KeyOut = "KO"
+
+    def __init__(self, transition, operand, name=None):
+        self.transition = transition
+        self.operand = operand
+        self.name = name
+
+    @property
+    def kind(self) -> Optional[str]:
+        """
+        Return the kind of transition: Cut, Wipe, etc
+        """
+        if self.cut:
+            return Transition.Cut
+        elif self.dissolve:
+            return Transition.Dissolve
+        elif self.wipe:
+            return Transition.Wipe
+        elif self.key_background:
+            return Transition.KeyBackground
+        elif self.key_foreground:
+            return Transition.Key
+        elif self.key_out:
+            return Transition.KeyOut
+
+    @property
+    def cut(self) -> bool:
+        "`True` if this transition is a cut."
+        return self.transition == 'C'
+
+    @property
+    def dissolve(self) -> bool:
+        "`True` if this traansition is a dissolve."
+        return self.transition == 'D'
+
+    @property
+    def wipe(self) -> bool:
+        "`True` if this transition is a wipe."
+        return self.transition.startswith('W')
+
+    @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)
+
+    @property
+    def wipe_number(self) -> Optional[int]:
+        "Wipes are identified by a particular number."
+        if self.wipe:
+            return int(self.transition[1:])
+        else:
+            return None
+
+    @property
+    def key_background(self) -> bool:
+        "`True` if this edit is a key background."
+        return self.transition == Transition.KeyBackground
+
+    @property
+    def key_foreground(self) -> bool:
+        "`True` if this edit is a key foreground."
+        return self.transition == Transition.Key
+
+    @property
+    def key_out(self) -> bool:
+        """
+        `True` if this edit is a key out. This material will removed from
+        the key foreground and replaced with the key background.
+        """
+        return self.transition == Transition.KeyOut

pycmx/util.py

@@ -4,7 +4,22 @@
 # Utility functions
 
 def collimate(a_string, column_widths):
-    'Splits a string into substrings that are column_widths length.'
+    """
+    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.
+
+    Returns:
+        A list of slices. The len() of the returned list will *always* equal
+        len(:column_widths:).
+    """
 
     if len(column_widths) == 0:
         return []
@@ -13,5 +28,3 @@ def collimate(a_string, column_widths):
     element = a_string[:width]
     rest = a_string[width:]
     return [element] + collimate(rest, column_widths[1:])
-
-

pyproject.toml

@@ -0,0 +1,56 @@
+[tool.poetry]
+name = "pycmx"
+version = "1.4.0"
+description = "Python CMX 3600 Edit Decision List Parser"
+authors = ["Jamie Hardt <jamiehardt@me.com>"]
+license = "MIT"
+readme = "README.md"
+keywords = [
+  'parser',
+  'film', 
+  'broadcast' 
+]
+classifiers = [
+  'Development Status :: 5 - Production/Stable',
+  'License :: OSI Approved :: MIT License',
+  'Topic :: Multimedia',
+  'Topic :: Multimedia :: Video',
+  'Topic :: Text Processing',
+  'Programming Language :: Python :: 3.8',
+  'Programming Language :: Python :: 3.9',
+  'Programming Language :: Python :: 3.10',
+  'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12',
+  'Programming Language :: Python :: 3.13'
+]
+homepage = "https://github.com/iluvcapra/pycmx"
+documentation = "https://pycmx.readthedocs.io/"
+repository = "https://github.com/iluvcapra/pycmx.git"
+urls.Tracker = "https://github.com/iluvcapra/pycmx/issues" 
+
+[tool.poetry.extras]
+doc = ['sphinx', 'sphinx_rtd_theme']
+
+[tool.poetry.dependencies]
+python = "^3.8"
+sphinx = { version='>= 5.3.0', optional=true}
+sphinx_rtd_theme = {version ='>= 1.1.1', optional=true}
+
+[tool.pyright]
+typeCheckingMode = "basic"
+
+[tool.pylint]
+max-line-length = 88
+disable = [
+    "C0103", # (invalid-name)
+    "C0114", # (missing-module-docstring)
+    "C0115", # (missing-class-docstring)
+    "C0116", # (missing-function-docstring)
+    "R0903", # (too-few-public-methods)
+    "R0913", # (too-many-arguments)
+    "W0105", # (pointless-string-statement)
+]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

setup.py

@@ -1,19 +0,0 @@
-from setuptools import setup
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setup(name='pycmx',
-      version='0.3',
-      author='Jamie Hardt',
-      author_email='jamiehardt@me.com',
-      description='CMX 3600 Edit Decision List Parser',
-      long_description_content_type="text/markdown",
-      long_description=long_description,
-      url='https://github.com/iluvcapra/pycmx',
-      classifiers=['Development Status :: 3 - Alpha',
-          'License :: OSI Approved :: MIT License',
-          'Topic :: Multimedia',
-          'Topic :: Multimedia :: Video',
-          'Topic :: Text Processing'],
-      packages=['pycmx'])

tests/__init__.py

@@ -0,0 +1 @@
+from . import test_parse

tests/edls/ISSUE_14_conform_edl_issue_01.edl

@@ -0,0 +1,13 @@
+TITLE: conform_edl_issue_01
+FCM: NON-DROP FRAME
+
+001  C_0022C003_241016_092821_h1F4X V     C        09:33:31:12 09:33:33:14 01:00:06:20 01:00:08:22  
+* FROM CLIP NAME: 13A-1-C
+
+002  B_0020C009_241003_214837_h1C2T V     C        21:48:54:22 21:48:55:15 01:01:34:06 01:01:34:23  
+* FROM CLIP NAME: 111B-1-B
+
+003  B_0088C002_241125_144410_h1C2T V     C        13:48:57:10 13:48:58:11 01:01:41:13 01:01:42:14  
+M2   B_0088C002_241125_144410_h1C2T       031.7                13:48:57:10
+* FROM CLIP NAME: 102C-2-B
+

tests/edls/ISSUE_14_conform_edl_issue_02.edl

@@ -0,0 +1,33 @@
+TITLE: conform_edl_issue_02
+FCM: NON-DROP FRAME
+
+001  C_0019C005_241014_204338_h1F4X V     C        11:19:41:07 11:19:49:03 02:04:48:10 02:04:56:06  
+* FROM CLIP NAME: 40E-4 MOS*
+
+002  B_0075C004_241114_164247_h1C2T V     C        15:43:03:12 15:43:05:17 02:06:03:03 02:06:05:08  
+* FROM CLIP NAME: 39B-4-B
+
+003  A_0079C015_241112_160227_h1EHP V     C        16:06:21:10 16:06:23:03 02:08:14:07 02:08:16:00  
+* FROM CLIP NAME: 46L-2
+
+004  C_0047C005_241121_123629_h1F4X V     C        11:41:15:17 11:41:21:01 02:09:08:01 02:09:13:09  
+* FROM CLIP NAME: 49-5-C
+
+005  A_0003C002_240923_130856_h1EHP V     C        14:11:06:01 14:11:12:03 02:11:26:11 02:11:32:13  
+* FROM CLIP NAME: 54-2-A
+
+006  A_0090C003_241119_095341_h1EHP V     C        09:57:25:14 09:57:32:20 02:13:40:13 02:13:47:19  
+* FROM CLIP NAME: 57B-3-A*
+
+007  A_0090C008_241119_102624_h1EHP V     C        10:30:43:07 10:30:46:23 02:14:16:01 02:14:19:17  
+* FROM CLIP NAME: 57D-2*
+
+008  B_0079C003_241119_105658_h1C2T V     C        09:58:57:15 09:59:00:14 02:15:01:08 02:15:04:07  
+* FROM CLIP NAME: 57B-3-B*
+
+009  A_0005C011_240924_113730_h1EHP V     C        12:40:01:07 12:40:04:06 02:16:13:11 02:16:16:10  
+* FROM CLIP NAME: 58C-3-A
+
+010  A_0060C001_241030_133415_h1EHP V     C        13:35:38:11 13:35:41:17 02:18:29:17 02:18:32:23  
+* FROM CLIP NAME: 61A-1
+

tests/edls/ISSUE_14_conform_edl_issue_03.edl

@@ -0,0 +1,129 @@
+TITLE: conform_edl_issue_03
+FCM: NON-DROP FRAME
+
+002  A_0113C007_250602_103141_h1D4P V     C        10:32:32:22 10:32:48:16 01:00:20:23 01:00:36:17  
+* FROM CLIP NAME: AP002A-3*
+
+003  A_0113C004_250602_101043_h1D4P V     C        10:11:34:01 10:11:48:01 01:00:36:17 01:00:50:17  
+* FROM CLIP NAME: AP002-4*
+
+004  A_0113C018_250602_122238_h1D4P V     C        12:24:03:12 12:24:04:17 01:01:15:17 01:01:16:22  
+* FROM CLIP NAME: AP002E-3-A*
+
+005  A_0113C018_250602_122238_h1D4P V     C        12:24:05:22 12:24:18:02 01:01:20:21 01:01:33:01  
+* FROM CLIP NAME: AP002E-3-A*
+
+006  A_0113C022_250602_125451_h1D4P V     C        12:55:43:09 12:55:55:03 01:01:33:01 01:01:44:19  
+* FROM CLIP NAME: AP002F-4-A*
+
+007  A_0113C024_250602_132048_h1D4P V     C        13:21:54:17 13:22:00:07 01:01:44:19 01:01:50:09  
+* FROM CLIP NAME: AP002G-2-A
+
+008  B_0098C009_250602_115121_h1EZ3 V     C        12:56:02:03 12:56:05:11 01:01:50:09 01:01:53:17  
+* FROM CLIP NAME: AP002F-4-B*
+
+009  A_0113C024_250602_132048_h1D4P V     C        13:21:41:20 13:21:46:01 01:01:53:17 01:01:57:22  
+* FROM CLIP NAME: AP002G-2-A
+
+010  A_0113C022_250602_125451_h1D4P V     C        12:56:08:09 12:56:12:23 01:01:57:22 01:02:02:12  
+* FROM CLIP NAME: AP002F-4-A*
+
+011  B_0099C004_250602_133201_h1EZ3 V     C        14:36:34:09 14:36:38:03 01:02:06:07 01:02:10:01  
+* FROM CLIP NAME: AP002H-4-B*
+
+012  A_0114C009_250602_161406_h1D4P V     C        16:15:15:09 16:15:17:16 01:02:10:01 01:02:12:08  
+* FROM CLIP NAME: AP002M-1-A
+
+013  A_0115C001_250602_172408_h1D4P V     C        17:25:55:01 17:25:59:17 01:02:20:15 01:02:25:07  
+* FROM CLIP NAME: AP002Q-1-A
+
+014  B_0099C019_250602_153856_h1EZ3 V     C        16:43:35:06 16:43:38:13 01:02:25:07 01:02:28:14  
+* FROM CLIP NAME: AP002N-2
+
+015  A_0115C002_250602_172803_h1D4P V     C        17:29:28:01 17:29:32:02 01:02:28:14 01:02:32:15  
+* FROM CLIP NAME: AP002Q-2-A*
+
+016  B_0099C019_250602_153856_h1EZ3 V     C        16:43:41:10 16:43:45:12 01:02:32:15 01:02:36:17  
+* FROM CLIP NAME: AP002N-2
+
+017  A_0115C001_250602_172408_h1D4P V     C        17:26:08:05 17:26:10:20 01:02:36:17 01:02:39:08  
+* FROM CLIP NAME: AP002Q-1-A
+
+018  B_0099C018_250602_153023_h1EZ3 V     C        16:35:28:00 16:35:30:10 01:02:39:08 01:02:41:18  
+* FROM CLIP NAME: AP002N-1*
+
+019  B_0100C001_250602_162041_h1EZ3 V     C        17:26:17:05 17:26:24:23 01:02:41:18 01:02:49:12  
+* FROM CLIP NAME: AP002Q-1-B
+
+020  A_0114C010_250602_162156_h1D4P V     C        16:24:28:03 16:24:33:20 01:02:49:12 01:02:55:05  
+* FROM CLIP NAME: AP002M-2-A*
+
+021  B_0099C007_250602_140229_h1EZ3 V     C        15:07:55:18 15:08:00:01 01:02:55:05 01:02:59:12  
+* FROM CLIP NAME: AP002K-2-B
+
+022  B_0099C018_250602_153023_h1EZ3 V     C        16:35:47:23 16:35:49:05 01:02:59:12 01:03:00:18  
+* FROM CLIP NAME: AP002N-1*
+
+023  B_0099C007_250602_140229_h1EZ3 V     C        15:08:01:17 15:08:12:19 01:03:00:18 01:03:11:20  
+* FROM CLIP NAME: AP002K-2-B
+
+024  B_0099C018_250602_153023_h1EZ3 V     C        16:36:10:00 16:36:11:10 01:03:11:20 01:03:13:06  
+* FROM CLIP NAME: AP002N-1*
+
+025  B_0099C007_250602_140229_h1EZ3 V     C        15:08:15:08 15:08:22:13 01:03:13:06 01:03:20:11  
+* FROM CLIP NAME: AP002K-2-B
+
+026  B_0099C018_250602_153023_h1EZ3 V     C        16:36:18:21 16:36:23:01 01:03:20:11 01:03:24:15  
+* FROM CLIP NAME: AP002N-1*
+
+027  B_0099C007_250602_140229_h1EZ3 V     C        15:08:33:21 15:08:37:23 01:03:30:14 01:03:34:16  
+* FROM CLIP NAME: AP002K-2-B
+
+028  B_0099C017_250602_151824_h1EZ3 V     C        16:25:21:01 16:25:29:04 01:03:34:16 01:03:42:19  
+* FROM CLIP NAME: AP002M-2-B*
+
+029  B_0099C007_250602_140229_h1EZ3 V     C        15:08:47:10 15:08:55:02 01:03:42:19 01:03:50:11  
+* FROM CLIP NAME: AP002K-2-B
+
+030  B_0099C017_250602_151824_h1EZ3 V     C        16:25:39:00 16:25:42:03 01:03:50:11 01:03:53:14  
+* FROM CLIP NAME: AP002M-2-B*
+
+031  B_0099C007_250602_140229_h1EZ3 V     C        15:08:58:10 15:09:03:04 01:03:53:14 01:03:58:08  
+* FROM CLIP NAME: AP002K-2-B
+
+032  B_0099C016_250602_151038_h1EZ3 V     C        16:17:20:21 16:17:23:10 01:03:58:08 01:04:00:21  
+* FROM CLIP NAME: AP002M-1-B
+
+033  B_0099C007_250602_140229_h1EZ3 V     C        15:09:05:09 15:09:16:04 01:04:00:21 01:04:11:16  
+* FROM CLIP NAME: AP002K-2-B
+
+034  B_0099C019_250602_153856_h1EZ3 V     C        16:45:46:08 16:45:52:18 01:04:11:16 01:04:18:02  
+* FROM CLIP NAME: AP002N-2
+
+035  B_0099C007_250602_140229_h1EZ3 V     C        15:09:24:21 15:09:27:22 01:04:18:02 01:04:21:03  
+* FROM CLIP NAME: AP002K-2-B
+
+036  B_0099C019_250602_153856_h1EZ3 V     C        16:45:55:19 16:45:58:02 01:04:21:03 01:04:23:10  
+* FROM CLIP NAME: AP002N-2
+
+037  B_0099C004_250602_133201_h1EZ3 V     C        14:38:53:22 14:38:58:19 01:04:23:10 01:04:28:07  
+* FROM CLIP NAME: AP002H-4-B*
+
+038  B_0099C015_250602_150046_h1EZ3 V     C        16:07:52:23 16:07:55:04 01:04:28:07 01:04:30:12  
+* FROM CLIP NAME: AP002L-1-B
+
+039  B_0099C007_250602_140229_h1EZ3 V     C        15:09:35:22 15:09:40:19 01:04:30:12 01:04:35:09  
+* FROM CLIP NAME: AP002K-2-B
+
+040  B_0099C015_250602_150046_h1EZ3 V     C        16:08:01:21 16:08:05:01 01:04:35:09 01:04:38:13  
+* FROM CLIP NAME: AP002L-1-B
+
+041  B_0099C007_250602_140229_h1EZ3 V     C        15:09:45:16 15:09:55:00 01:04:38:13 01:04:47:21  
+* FROM CLIP NAME: AP002K-2-B
+
+042  M018C0005_240925_1F4L13 V     C        18:44:20:12 18:44:23:18 01:04:50:16 01:04:53:22  
+* FROM CLIP NAME: 13-1-SER-1-M MOS
+
+043  A_0022C009_241003_141208_h1EHP V     C        15:13:54:11 15:13:56:04 01:12:22:02 01:12:23:19  
+* FROM CLIP NAME: 26H-3-A*
+

tests/edls/test_24psf.edl

@@ -0,0 +1,60 @@
+TITLE: Test EDL 24
+
+001  AX       V     C        01:00:00:00 01:00:59:24 00:00:00:00 00:00:59:24
+* FROM CLIP NAME: clip 1
+
+002  AX       AA    C        00:00:00:00 00:01:30:00 00:00:00:00 00:01:30:00
+* FROM CLIP NAME: clip #2
+
+003  AX       V     C        00:00:00:00 00:00:30:01 00:00:59:24 00:01:30:00
+* FROM CLIP NAME: clip -3
+AUD  3    4
+
+004  AX       V     C        00:00:00:00 00:00:24:17 00:01:30:00 00:01:54:17
+* FROM CLIP NAME: clip $4
+
+005  AX       V     C        00:00:00:00 00:00:24:17 00:01:30:00 00:01:54:17
+* FROM CLIP NAME: clip &5
+
+006  AX       AA    C        00:00:29:01 00:00:29:01 00:01:59:01 00:01:59:01
+006  BL       AA    W001 025 00:00:00:00 00:00:10:20 00:01:59:01 00:02:10:21
+EFFECTS NAME IS Constant Power
+* FROM CLIP NAME: Test rename
+* TO CLIP NAME: BL
+
+007  AX       V     C        01:00:00:00 01:00:05:00 00:02:01:10 00:02:06:10
+* FROM CLIP NAME: Black Video
+
+008  AX       V     C        01:00:10:14 01:00:15:00 00:02:06:10 00:02:10:21
+* FROM CLIP NAME: Jellyfish.jpg
+
+009  AX       V     C        00:00:00:00 00:00:30:01 00:02:10:21 00:02:40:22
+* FROM CLIP NAME: Test rename
+M2   AX       -25.0                      00:00:00:00 
+
+010  AX       AA    C        00:00:00:00 00:00:30:01 00:02:10:21 00:02:40:22
+* FROM CLIP NAME: Test rename
+M2   AX       -25.0                      00:00:00:00 
+
+REM The MIT License (MIT)
+REM 
+REM Copyright (c) 2013 <simon@simon-hargreaves.com>
+REM 
+REM Permission is hereby granted, free of charge, to any person obtaining a copy
+REM of this software and associated documentation files (the "Software"), to deal
+REM in the Software without restriction, including without limitation the rights
+REM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+REM copies of the Software, and to permit persons to whom the Software is
+REM furnished to do so, subject to the following conditions:
+REM 
+REM The above copyright notice and this permission notice shall be included in
+REM all copies or substantial portions of the Software.
+REM 
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+REM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+REM AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+REM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+REM THE SOFTWARE.
+REM 

tests/edls/test_25.edl

@@ -0,0 +1,66 @@
+TITLE: Sequence 01
+
+001  AX       V     C        01:00:00:00 01:00:59:24 00:00:00:00 00:00:59:24
+* FROM CLIP NAME: Jellyfish.jpg
+
+002  AX       AA    C        00:00:00:00 00:01:30:00 00:00:00:00 00:01:30:00
+* FROM CLIP NAME: N5_final screensaver_mp4.mov
+
+003  AX       V     C        00:00:00:00 00:00:30:01 00:00:59:24 00:01:30:00
+* FROM CLIP NAME: Test rename
+AUD  3    4
+
+004  AX       V     C        00:00:00:00 00:00:24:17 00:01:30:00 00:01:54:17
+* FROM CLIP NAME: Test rename
+
+005  AX       V     C        00:00:24:17 00:00:24:17 00:01:54:17 00:01:54:17
+005  AX       V     D    070 00:59:58:21 01:00:05:14 00:01:54:17 00:02:01:10
+EFFECTS NAME IS CROSS DISSOLVE
+* FROM CLIP NAME: Test rename
+* TO CLIP NAME: Jellyfish.jpg
+
+006  AX       AA    C        00:00:00:00 00:00:29:01 00:01:30:00 00:01:59:01
+* FROM CLIP NAME: Test rename
+
+007  AX       AA    C        00:00:29:01 00:00:29:01 00:01:59:01 00:01:59:01
+007  BL       AA    W001 025 00:00:00:00 00:00:10:20 00:01:59:01 00:02:10:21
+EFFECTS NAME IS Constant Power
+* FROM CLIP NAME: Test rename
+* TO CLIP NAME: BL
+
+008  AX       V     C        01:00:00:00 01:00:05:00 00:02:01:10 00:02:06:10
+* FROM CLIP NAME: Black Video
+
+009  AX       V     C        01:00:10:14 01:00:15:00 00:02:06:10 00:02:10:21
+* FROM CLIP NAME: Jellyfish.jpg
+
+010  AX       V     C        00:00:00:00 00:00:30:01 00:02:10:21 00:02:40:22
+* FROM CLIP NAME: Test rename
+M2   AX       -25.0                      00:00:00:00 
+
+011  AX       AA    C        00:00:00:00 00:00:30:01 00:02:10:21 00:02:40:22
+* FROM CLIP NAME: Test rename
+M2   AX       -25.0                      00:00:00:00 
+
+REM The MIT License (MIT)
+REM 
+REM Copyright (c) 2013 <simon@simon-hargreaves.com>
+REM 
+REM Permission is hereby granted, free of charge, to any person obtaining a copy
+REM of this software and associated documentation files (the "Software"), to deal
+REM in the Software without restriction, including without limitation the rights
+REM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+REM copies of the Software, and to permit persons to whom the Software is
+REM furnished to do so, subject to the following conditions:
+REM 
+REM The above copyright notice and this permission notice shall be included in
+REM all copies or substantial portions of the Software.
+REM 
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+REM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+REM AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+REM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+REM THE SOFTWARE.
+REM 

tests/edls/test_edl_cdl.edl

@@ -0,0 +1,42 @@
+TITLE:   test_edl_cdl
+FCM: NON-DROP FRAME
+000001  BAAAAAAA_00001_ABCD              V     C        01:00:00:01 01:00:02:01 01:00:00:00 01:00:02:00
+*ASC_SOP (0.8111 0.8112 0.8113)(0.2111 0.2112 0.2113)(1.8111 1.8112 1.8113)
+*ASC_SAT 0.91
+*Descript: 
+*FROM CLIP NAME:  dra_001_0001_v0001 
+*LOC: 1:00:01:00  YELLOW  DRA_001_0001
+000002  BAAAAAAA_00001_ABCD              V     C        01:00:00:02 01:00:02:02 01:00:02:00 01:00:04:00
+*ASC_SOP (0.8121 0.8122 0.8123)(0.2121 0.2122 0.2123)(1.8121 1.8122 1.8123)
+*ASC_SAT 0.82
+*Descript: 
+*FROM CLIP NAME:  dra_001_0002_v0001 
+*LOC: 1:00:03:00  YELLOW  DRA_001_0002
+000003  BAAAAAAA_00001_ABCD              V     C        01:00:00:03 01:00:02:03 01:00:04:00 01:00:06:00
+*ASC_SOP (0.8131 0.8132 0.8133)(0.2131 0.2132 0.2133)(1.8131 1.8132 1.8133)
+*ASC_SAT 0.73
+*Descript: 
+*FROM CLIP NAME:  dra_001_0003_v0001 
+*LOC: 1:00:05:00  YELLOW  DRA_001_0003
+
+REM The MIT License (MIT)
+REM 
+REM Copyright (c) 2014 Simon Hargreaves
+REM 
+REM Permission is hereby granted, free of charge, to any person obtaining a copy
+REM of this software and associated documentation files (the "Software"), to deal
+REM in the Software without restriction, including without limitation the rights
+REM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+REM copies of the Software, and to permit persons to whom the Software is
+REM furnished to do so, subject to the following conditions:
+REM 
+REM The above copyright notice and this permission notice shall be included in all
+REM copies or substantial portions of the Software.
+REM 
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+REM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+REM AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+REM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+REM SOFTWARE.

tests/test_parse.py

@@ -2,26 +2,138 @@ from unittest import TestCase
 
 import pycmx
 
+
 class TestParse(TestCase):
 
-    def test_edls(self):
+    files = ["INS4_R1_010417.edl",
-        files = ["INS4_R1_010417.edl" ,
+             "INS4_R1_DX_092117.edl",
-                  "STP R1 v082517.edl",
+             "STP R1 v082517.edl",
-                  "ToD_R4_LOCK3.1_030618_Video.edl",
+             "ToD_R4_LOCK3.1_030618_Video.edl",
-                  "TEST.edl"
+             "TEST.edl",
-                ]
+             "test_edl_cdl.edl",
+             "INS4_R1_DX_092117.edl"
+             ]
 
-        counts = [ 287, 250 , 376, 148  ]
+    def test_event_counts(self):
 
+        counts = [287, 466, 250, 376, 120, 3, 466]
 
-        for fn, count in zip(files, counts):
+        for fn, count in zip(type(self).files, counts):
-            events = pycmx.parse_cmx3600(f"tests/edls/{fn}" )
+            with open("tests/edls/" + fn, 'r') as f:
-            self.assertTrue( len(events) == count , f"expected {len(events)} but found {count}")
+                edl = pycmx.parse_cmx3600(f)
+                actual = len(list(edl.events))
+                self.assertTrue(actual == count,
+                                "expected %i in file %s but found %i"
+                                % (count, fn, actual))
 
-    def test_audio_channels(self):
+    def test_list_sanity(self):
-        events = pycmx.parse_cmx3600(f"tests/edls/TEST.edl" )
+        for fn in type(self).files:
-        self.assertTrue(events[0].channels.a2)
+            with open("tests/edls/" + fn, 'r') as f:
-        self.assertFalse(events[0].channels.a1)
+                edl = pycmx.parse_cmx3600(f)
-        self.assertTrue(events[2].channels.get_audio_channel(7))
+                self.assertTrue(type(edl.title) is str)
+                self.assertTrue(len(edl.title) > 0)
 
+    def test_event_sanity(self):
+        for fn in type(self).files:
+            path = "tests/edls/" + fn
+            with open(path, 'r') as f:
+                edl = pycmx.parse_cmx3600(f)
+                for index, event in enumerate(edl.events):
+                    self.assertTrue(len(event.edits) > 0,
+                                    f"Failed for {path}")
+                    self.assertEqual(event.number, index + 1,
+                                     f"Failed for {path}")
 
+    def test_events(self):
+        with open("tests/edls/TEST.edl", 'r') as f:
+            edl = pycmx.parse_cmx3600(f)
+            events = list(edl.events)
+
+            self.assertEqual(events[0].number, 1)
+            self.assertEqual(events[0].edits[0].source, "OY_HEAD_")
+            self.assertEqual(events[0].edits[0].clip_name, "HEAD LEADER MONO")
+            self.assertEqual(
+                events[0].edits[0].source_file, "OY_HEAD_LEADER.MOV")
+            self.assertEqual(events[0].edits[0].source_in, "00:00:00:00")
+            self.assertEqual(events[0].edits[0].source_out, "00:00:00:00")
+            self.assertEqual(events[0].edits[0].record_in, "01:00:00:00")
+            self.assertEqual(events[0].edits[0].record_out, "01:00:08:00")
+            self.assertTrue(
+                events[0].edits[0].transition.kind == pycmx.Transition.Cut)
+
+    def test_channel_map(self):
+        with open("tests/edls/TEST.edl", 'r') as f:
+            edl = pycmx.parse_cmx3600(f)
+            events = list(edl.events)
+            self.assertFalse(events[0].edits[0].channels.video)
+            self.assertFalse(events[0].edits[0].channels.a1)
+            self.assertTrue(events[0].edits[0].channels.a2)
+            self.assertTrue(events[2].edits[0].channels.get_audio_channel(7))
+            self.assertTrue(events[2].edits[0].channels.audio)
+
+    def test_multi_edit_events(self):
+        with open("tests/edls/TEST.edl", 'r') as f:
+            edl = pycmx.parse_cmx3600(f)
+            events = list(edl.events)
+
+            self.assertEqual(events[42].number, 43)
+            self.assertEqual(len(events[42].edits), 2)
+
+            self.assertEqual(events[42].edits[0].source, "TC_R1_V1")
+            self.assertEqual(events[42].edits[0].clip_name,
+                             "TC R1 V1.2 TEMP1 FX ST.WAV")
+            self.assertEqual(events[42].edits[0].source_in, "00:00:00:00")
+            self.assertEqual(events[42].edits[0].source_out, "00:00:00:00")
+            self.assertEqual(events[42].edits[0].record_in, "01:08:56:09")
+            self.assertEqual(events[42].edits[0].record_out, "01:08:56:09")
+            self.assertTrue(
+                events[42].edits[0].transition.kind == pycmx.Transition.Cut)
+
+            self.assertEqual(events[42].edits[1].source, "TC_R1_V6")
+            self.assertEqual(events[42].edits[1].clip_name,
+                             "TC R1 V6 TEMP2 ST FX.WAV")
+            self.assertEqual(events[42].edits[1].source_in, "00:00:00:00")
+            self.assertEqual(events[42].edits[1].source_out, "00:00:00:00")
+            self.assertEqual(events[42].edits[1].record_in, "01:08:56:09")
+            self.assertEqual(events[42].edits[1].record_out, "01:08:56:11")
+            self.assertTrue(
+                events[42].edits[1].transition.kind ==
+                pycmx.Transition.Dissolve)
+
+    def test_line_numbers(self):
+        with open("tests/edls/ToD_R4_LOCK3.1_030618_Video.edl") as f:
+            edl = pycmx.parse_cmx3600(f)
+
+            events = list(edl.events)
+            self.assertEqual(events[0].edits[0].line_number, 2)
+            self.assertEqual(events[14].edits[0].line_number, 45)
+            self.assertEqual(events[180].edits[0].line_number, 544)
+
+    def test_transition_name(self):
+        with open("tests/edls/test_25.edl", "r") as f:
+            edl = pycmx.parse_cmx3600(f)
+            events = list(edl.events)
+            self.assertEqual(
+                events[4].edits[1].transition.name,  "CROSS DISSOLVE")
+
+    def test_adobe_wide(self):
+        with open("tests/edls/adobe_dai109_test.txt", 'r',
+                  encoding='ISO-8859-1') as f:
+            edl = pycmx.parse_cmx3600(f)
+            events = list(edl.events)
+
+            self.assertEqual(len(events), 2839)
+
+    def test_issue14(self):
+        with open("tests/edls/ISSUE_14_conform_edl_issue_03.edl", "r") as f:
+            edl = pycmx.parse_cmx3600(f)
+
+            for event in edl.events:
+                if event.number == 42:
+                    self.assertEqual(len(event.edits), 1)
+                    self.assertEqual(event.edits[0].source,
+                                     "M018C0005_240925_1F4L13")
+                    self.assertEqual(event.edits[0].transition.kind,
+                                     pycmx.Transition.Cut)
+                    self.assertEqual(event.edits[0].source_in,
+                                     "18:44:20:12")