Added handling for extra blank lines after the Column statement.\nCo-authored-by: Sean Wallitsch <shidarin@alphamatte.com>

Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>

Author: reinecke

src/otio_ale_adapter/ale.py

@@ -214,7 +214,13 @@ def _read_columns(lines):
     Consumes the Column information from the ALE and returns the list of
     columns.
     """
-    line = lines.pop(0)
+    try:
+        line = lines.pop(0)
+        while not line.strip():
+            line = lines.pop(0)
+    except IndexError:
+        raise ALEParseError("Unexpected end of file after 'Column'")
+
     columns = line.split("\t")
 
     return columns

tests/sample_data/sample_blanks.ale

@@ -0,0 +1,22 @@
+Heading
+
+FIELD_DELIM	TABS
+
+VIDEO_FORMAT	1080
+
+AUDIO_FORMAT	48khz
+
+FPS	25
+
+
+
+Column
+
+Name	Tracks	Start	End	Take	Tape	UNC	FPS	Reel	Scene	Shoot date	Manufacturer	Source Resolution	Source Bit Depth	DESCRIPT	Comments	Audio SR	Audio Bit Depth	Auxiliary TC1	KN Start	Source File Path	Filter	Camera ID	ISO	Lens Number	Camera Serial #	Camera Type	White Point (Kelvin)	Angle	Camera	Clip Number	Stereoscopic Eye	Gamma Space	LUT 1	ASC_SOP	ASC_SAT	RESOLVE_SIZING	
+
+
+
+Data
+
+A020C003_150905_E2XZ.mov	V	05:42:12:20	05:42:30:12		A020E2XZ	Y:\Pennrand_CompWorkflow_XXXXXX\04_Compositing\11_Render_Compositing\PennComp_Za250\PennComp_Za250_Raw\A020C003_150905_E2XZ.mov	25	A020E2XZ		20150905	DaVinci Resolve	2048x1152	16							Y:\Pennrand_CompWorkflow_XXXXXX\04_Compositing\11_Render_Compositing\PennComp_Za250\PennComp_Za250_Raw\A020C003_150905_E2XZ.mov	0	E2XZ	800	0	3120	Alexa Plus	4700	1800	A	A020C003_150905_E2XZ	SINGLE	LOG-C	None	(1.1822 1.2183 1.2284)(-0.2429 -0.2823 -0.2849)(0.7283 0.7096 0.7054)	1.0680	(0.0000 0.0000 1.0000 0.0000 0.0000 0 0)	
+

…mple_no_blank_lines_between_sections.ale tests/sample_data/sample_no_blanks.aletests/sample_data/sample_no_blank_lines_between_sections.ale renamed to tests/sample_data/sample_no_blanks.ale tests/sample_data/sample_no_blank_lines_between_sections.ale renamed to tests/sample_data/sample_no_blanks.ale

@@ -13,11 +13,9 @@
 EXAMPLE_PATH = os.path.join(SAMPLE_DATA_DIR, "sample.ale")
 EXAMPLE2_PATH = os.path.join(SAMPLE_DATA_DIR, "sample2.ale")
 EXAMPLE_CDL_PATH = os.path.join(SAMPLE_DATA_DIR, "sample_cdl.ale")
-EXAMPLE_NO_SECTION_NEWLINE_PATH = os.path.join(
-    SAMPLE_DATA_DIR, "sample_no_blank_lines_between_sections.ale"
-)
 EXAMPLEUHD_PATH = os.path.join(SAMPLE_DATA_DIR, "sampleUHD.ale")
-
+EXAMPLE_BLANK_PATH = os.path.join(SAMPLE_DATA_DIR, "sample_blanks.ale")
+EXAMPLE_NO_BLANKS = os.path.join(SAMPLE_DATA_DIR, "sample_no_blanks.ale")
 
 class ALEAdapterTest(unittest.TestCase):
 
@@ -174,9 +172,41 @@ def test_ale_uhd(self):
         )
         self.assertEqual(frmt, "CUSTOM")
 
-    def test_ale_no_newline_between_sections(self):
-        ale_path = EXAMPLE_NO_SECTION_NEWLINE_PATH
+    def test_ale_read_blank_lines(self):
+        ale_path = EXAMPLE_BLANK_PATH
         collection = otio.adapters.read_from_file(ale_path)
+        self.assertTrue(collection is not None)
+        self.assertEqual(type(collection), otio.schema.SerializableCollection)
+        self.assertEqual(len(collection), 1)
+        # The ALE header information is the original FPS stored in the file,
+        # and not the nearest SMPTE timecode rate
+        fps = float(collection.metadata.get("ALE").get("header").get("FPS"))
+        self.assertEqual(fps, 25)
+        self.assertEqual([c.name for c in collection], [
+            "A020C003_150905_E2XZ.mov"
+        ])
+        self.assertEqual(collection[0].source_range, otio.opentime.TimeRange(
+                otio.opentime.from_timecode("05:42:12:20", fps),
+                otio.opentime.from_timecode("00:00:17:17", fps)
+        ))
+
+        # Slope, offset, and power values are of type _otio.AnyVector
+        # So we have to convert them to lists otherwise
+        # the comparison between those two types would fail
+
+        self.assertEqual(
+            list(collection[0].metadata['cdl']['asc_sop']['slope']),
+            [1.1822, 1.2183, 1.2284])
+        self.assertEqual(
+            list(collection[0].metadata['cdl']['asc_sop']['offset']),
+            [-0.2429, -0.2823, -0.2849])
+        self.assertEqual(
+            list(collection[0].metadata['cdl']['asc_sop']['power']),
+            [0.7283, 0.7096, 0.7054])
+        self.assertEqual(collection[0].metadata['cdl']['asc_sat'], 1.0680)
+
+    def test_ale_no_newline_between_sections(self):
+        collection = otio.adapters.read_from_file(EXAMPLE_NO_BLANKS)
         assert len(collection) == 6
 
         # Spot-check one of the clips