Merge branch 'master' of https://github.com/iluvcapra/pycmx into 16-feat-asc_cdl-and-frmc

This commit is contained in:
2025-12-16 09:42:29 -08:00
6 changed files with 208 additions and 35 deletions

View File

@@ -58,27 +58,18 @@ def _parse_cmx3600_line(line: str, line_number: int) -> object:
: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} ")
x_event_form_p = re.compile("^([0-9]{4,5}) ")
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 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_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_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("*"):
@@ -108,25 +99,15 @@ def _parse_fcm(line, line_num) -> StmtFCM:
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_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":
return StmtAudioExt(audio3=True, audio4=False, line_number=line_number)
elif content == "AUD 4":
return StmtAudioExt(audio3=False, audio4=True, line_number=line_number)
elif content == "AUD 3 4":
return StmtAudioExt(audio3=True, audio4=True, line_number=line_number)
audio3 = True if "3" in content else False
audio4 = True if "4" in content else False
if audio3 or audio4:
return StmtAudioExt(audio3, audio4, line_number)
else:
return StmtUnrecognized(content=line, line_number=line_number)
return StmtUnrecognized(line, line_number)
def _parse_remark(line, line_number) -> object:

View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "pycmx"
version = "1.3.0"
version = "1.4.0"
description = "Python CMX 3600 Edit Decision List Parser"
authors = ["Jamie Hardt <jamiehardt@me.com>"]
license = "MIT"

View File

@@ -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

View File

@@ -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

View File

@@ -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*

View File

@@ -39,8 +39,10 @@ class TestParse(TestCase):
with open(path, 'r') as f:
edl = pycmx.parse_cmx3600(f)
for index, event in enumerate(edl.events):
self.assertTrue(len(event.edits) > 0)
self.assertTrue(event.number == index + 1)
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:
@@ -119,4 +121,19 @@ class TestParse(TestCase):
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")