Make srt more flexible with spaces

mantas-done · Jun 27, 2023 · 40890d2 · 40890d2
1 parent 90dda54
commit 40890d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Code/Converters/SrtConverter.php b/src/Code/Converters/SrtConverter.php
@@ -6,7 +6,7 @@ class SrtConverter implements ConverterContract
 {
     public function canParseFileContent($file_content)
     {
-        return preg_match('/^\d?\R(\d{2}:\d{2}:\d{2},\d{3}\s-->\s\d{2}:\d{2}:\d{2},\d{3})\R(.+)$/m', $file_content) === 1;
+        return preg_match('/^\d?\R(\d{2}:\d{2}:\d{2},\d{3}\s*-->\s*\d{2}:\d{2}:\d{2},\d{3})\R(.+)$/m', $file_content) === 1;
     }
 
     /**
@@ -21,7 +21,7 @@ public function fileContentToInternalFormat($file_content)
 
         $blocks = explode("\n\n", trim($file_content)); // each block contains: start and end times + text
         foreach ($blocks as $block) {
-            preg_match('/(?<start>.*) --> (?<end>.*)\n(?<text>(\n*.*)*)/m', $block, $matches);
+            preg_match('/(?<start>.*) *--> *(?<end>.*)\n(?<text>(\n*.*)*)/m', $block, $matches);
 
             // if block doesn't contain text (invalid srt file given)
             if (empty($matches)) {

diff --git a/tests/formats/SrtTest.php b/tests/formats/SrtTest.php
@@ -60,14 +60,31 @@ public function testRemovesEmptyLines()
 Very good, Lieutenant.
 TEXT;
 
-        $actual_format = Subtitles::loadFromString($content, 'srt')->getInternalFormat();
+        $actual_format = Subtitles::loadFromString($content)->getInternalFormat();
         $expected_format = (new Subtitles())
             ->add(3, 4, ['Very good, Lieutenant.'])
             ->getInternalFormat();
         $this->assertEquals($expected_format, $actual_format);
 
     }
 
+    public function testParsesClientFile()
+    {
+        $content = <<< TEXT
+1
+00:00:01,000-->00:00:02,000
+1
+
+TEXT;
+
+        $actual_format = Subtitles::loadFromString($content)->getInternalFormat();
+        $expected_format = (new Subtitles())
+            ->add(1, 2, ['1'])
+            ->getInternalFormat();
+        $this->assertEquals($expected_format, $actual_format);
+
+    }
+
     // ---------------------------------- private ----------------------------------------------------------------------
 
     private static function fileContent()