Merge branch 'release/2.0.2'

Rudloff · Jun 17, 2019 · b139e6e · b139e6e
2 parents a0811c6 + 6a28011
commit b139e6e
Show file tree

Hide file tree

Showing 12 changed files with 400 additions and 282 deletions.
diff --git a/classes/Config.php b/classes/Config.php
@@ -126,6 +126,13 @@ class Config
      */
     private $file;
 
+    /**
+     * Generic formats supported by youtube-dl.
+     *
+     * @var array
+     */
+    public $genericFormats = [];
+
     /**
      * Config constructor.
      *
@@ -135,6 +142,42 @@ private function __construct(array $options = [])
     {
         $this->applyOptions($options);
         $this->getEnv();
+
+        if (empty($this->genericFormats)) {
+            // We don't put this in the class definition so it can be detected by xgettext.
+            $this->genericFormats = [
+                'best'                => _('Best'),
+                'bestvideo+bestaudio' => _('Remux best video with best audio'),
+                'worst'               => _('Worst'),
+            ];
+        }
+
+        foreach ($this->genericFormats as $format => $name) {
+            if (strpos($format, '+') !== false) {
+                if (!$this->remux) {
+                    // Disable combined formats if remux mode is not enabled.
+                    unset($this->genericFormats[$format]);
+                }
+            } elseif (!$this->stream) {
+                // Force HTTP if stream is not enabled.
+                $this->replaceGenericFormat($format, $format.'[protocol=https]/'.$format.'[protocol=http]');
+            }
+        }
+    }
+
+    /**
+     * Replace a format key.
+     *
+     * @param string $oldFormat Old format
+     * @param string $newFormat New format
+     *
+     * @return void
+     */
+    private function replaceGenericFormat($oldFormat, $newFormat)
+    {
+        $keys = array_keys($this->genericFormats);
+        $keys[array_search($oldFormat, $keys)] = $newFormat;
+        $this->genericFormats = array_combine($keys, $this->genericFormats);
     }
 
     /**

diff --git a/classes/streams/YoutubeStream.php b/classes/streams/YoutubeStream.php
@@ -29,7 +29,7 @@ public function __construct(Video $video)
 
         while ($rangeStart < $contentLenghtHeader[0]) {
             $rangeEnd = $rangeStart + $video->downloader_options->http_chunk_size;
-            if ($rangeEnd > $contentLenghtHeader[0]) {
+            if ($rangeEnd >= $contentLenghtHeader[0]) {
                 $rangeEnd = $contentLenghtHeader[0] - 1;
             }
             $response = $video->getHttpResponse(['Range' => 'bytes='.$rangeStart.'-'.$rangeEnd]);

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
     "ffmpeg/ffmpeg": "4.0.3",
-    "rg3/youtube-dl": "2019.04.24",
+    "rg3/youtube-dl": "2019.06.08",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1",
     "phpstan/phpstan": "~0.9.2"
@@ -40,10 +40,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2019.04.24",
+        "version": "2019.06.08",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2019.04.24.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2019.06.08.zip"
         }
       }
     },