Fix csv file recognition

mantas-done · Apr 9, 2024 · 87ae0a9 · 87ae0a9
1 parent b1058a7
commit 87ae0a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Code/Converters/CsvConverter.php b/src/Code/Converters/CsvConverter.php
@@ -178,7 +178,7 @@ private static function csvToArray($content)
 
         $csv2 = [];
         foreach ($csv as $row) {
-            if (!isset($row[0]) || !isset($row[1])) {
+             if ($row[0] == '' && !isset($row[1])) { // empty line
                 continue;
             }
             if (trim($row[0]) === '' && trim($row[1]) === '') {

diff --git a/tests/formats/CsvTest.php b/tests/formats/CsvTest.php
@@ -208,4 +208,13 @@ public function testSpeakerInFrontAndEmptyLines()
 
         $this->assertInternalFormatsEqual($expected_internal_format, $actual_internal_format);
     }
+
+    public function testDifferentElementCountShouldntBeInterpretedAsCsv()
+    {
+        $csv = 'Start,End,Text
+hi
+3740.476,3742.501,"Very good, Lieutenant."';
+        $converter = Helpers::getConverterByFileContent($csv);
+        $this->assertTrue(get_class($converter) !== CsvConverter::class, get_class($converter));
+    }
 }