Added contextual data to EDLParserError where available

Signed-off-by: Eric Reinecke <ereinecke@netflix.com>
OpenTimelineIO · Dec 11, 2023 · 5e86a53 · 5e86a53
1 parent 3af9b9c
commit 5e86a53
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/otio_cmx3600_adapter/cmx_3600_reader.py b/src/otio_cmx3600_adapter/cmx_3600_reader.py
@@ -358,7 +358,8 @@ def load_from_statements(self, statements: Iterator[EDLStatement]):
                     should_start_new_event = True
                 elif current_event is None:
                     raise EDLParseError(
-                        f"Unknown statement type on line {statement.line_number}"
+                        f"Unknown statement type on line {statement.line_number}",
+                        line_number=statement.line_number,
                     )
 
             # accumulate statements in the same event
@@ -575,13 +576,17 @@ def make_transition(
         else:
             raise EDLParseError(
                 f"Transition type '{effect.type}' on line {statement.line_number}"
-                " not supported by the CMX EDL reader currently."
+                " not supported by the CMX EDL reader currently.",
+                line_number=statement.line_number,
+                event_number=statement.edit_number,
             )
 
         if effect.transition_duration is None:
             raise EDLParseError(
                 f"Transition type '{effect.type}' on line {statement.line_number}"
-                "is missing a duration."
+                "is missing a duration.",
+                line_number = statement.line_number,
+                event_number = statement.edit_number,
             )
         transition_duration = opentime.RationalTime(
             effect.transition_duration,

diff --git a/src/otio_cmx3600_adapter/edl_parser.py b/src/otio_cmx3600_adapter/edl_parser.py
@@ -123,7 +123,9 @@ def statements_from_lines(
         if len(fields) < 3:
             raise EDLParseError(
                 f"incorrect number of fields [{len(fields)}] in line number:"
-                f" {line_number} statement: {line}"
+                f" {line_number} statement: {line}",
+                line_number=line_number,
+                event_number=edit_number,
             )
 
         # consume the fields from the head of the line
@@ -164,7 +166,9 @@ def statements_from_lines(
         if (len(fields) < 6 or len(fields) > 8) and not allow_best_effort_parsing:
             raise EDLParseError(
                 f"incorrect number of fields [{len(fields)}] in line number:"
-                f" {line_number} statement: {line}"
+                f" {line_number} statement: {line}",
+                line_number=line_number,
+                event_number=edit_number,
             )
 
         # Consume the record and source fields from the end of the line back

diff --git a/src/otio_cmx3600_adapter/exceptions.py b/src/otio_cmx3600_adapter/exceptions.py
@@ -1,5 +1,13 @@
 from opentimelineio import exceptions
 
+from typing import Optional
+
 
 class EDLParseError(exceptions.OTIOError):
-    pass
+    line_number: Optional[int] = None
+    event_number: Optional[str] = None
+
+    def __init__(self, message, line_number=None, event_number=None):
+        super().__init__(message)
+        self.line_number = line_number
+        self.event_number = event_number