Refactor getData method

waska14 · Jan 24, 2023 · b12e6be · b12e6be
1 parent dae19dc
commit b12e6be
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Overrides/YoutubeDl/YoutubeDl.php b/src/Overrides/YoutubeDl/YoutubeDl.php
@@ -105,8 +105,11 @@ public function getData(string $videoUrl): ?array
                 $output = $this->getProcessOutput($process);
                 $data = array_filter(preg_split('/[\r\n]/', $output));
                 if (count($data) < 4 || count($data) > 5) {
-                    sleep(1); // Try again in 5 seconds
+                    sleep(1); // Try again
                 } else {
+                    if ($i == 4) {
+                        return null;
+                    }
                     break;
                 }
             }
@@ -115,10 +118,6 @@ public function getData(string $videoUrl): ?array
             } else {
                 $data = array_combine(['warning', 'title', 'id', 'url', 'format'], $data);
             }
-            $data = array_combine([
-                'title', 'id', 'url', 'format'
-            ], array_filter(preg_split('/[\r\n]/', $output)));
-            $url = $data['url'];
 
             $data['format'] = Str::afterLast(Str::beforeLast($data['format'], ' '), ' ');
             list($data['width'], $data['height']) = explode('x', $data['format']);