Merge branch 'release-0.7.1'

FAQ.md

@@ -42,7 +42,15 @@ sudo apt-get install libav-tools curl
 Create a dyno with the following buildpacks:
 
 * `heroku/php`
-* `https://github.com/heroku/heroku-buildpack-nodejs`
+* `heroku/nodejs`
+* `heroku/python`
+
+You might also need to add the following config variables:
+
+```env
+CONVERT=1
+PYTHON=/app/.heroku/python/bin/python
+```
 
 Then push the code to Heroku and it should work out of the box.
 

classes/Config.php

@@ -109,6 +109,9 @@ public function __construct(array $options)
         if (getenv('CONVERT')) {
             $this->convert = (bool) getenv('CONVERT');
         }
+        if (getenv('PYTHON')) {
+            $this->python = getenv('PYTHON');
+        }
     }
 
     /**

classes/VideoDownload.php

@@ -265,6 +265,9 @@ public function getAudioStream($url, $format, $password = null)
         }
 
         $video = $this->getJSON($url, $format, $password);
+        if (in_array($video->protocol, ['m3u8', 'm3u8_native'])) {
+            throw(new \Exception('Conversion of M3U8 files is not supported.'));
+        }
 
         //Vimeo needs a correct user-agent
         ini_set(

composer.json

@@ -6,7 +6,7 @@
   "type": "project",
   "require": {
     "smarty/smarty": "~3.1.29",
-    "slim/slim": "~3.6.0",
+    "slim/slim": "~3.7.0",
     "mathmarques/smarty-view": "~1.1.0",
     "symfony/yaml": "~3.2.0",
     "symfony/process": "~3.2.0",
@@ -19,8 +19,9 @@
     "squizlabs/php_codesniffer": "~2.7.0",
     "phpunit/phpunit": "~5.7.2",
     "ffmpeg/ffmpeg": "dev-release",
-    "rg3/youtube-dl": "~2016.09.08",
-    "rudloff/rtmpdump-bin": "~2.3"
+    "rg3/youtube-dl": "~2016.12.22",
+    "rudloff/rtmpdump-bin": "~2.3",
+    "heroku/heroku-buildpack-php": "*"
   },
   "extra": {
     "paas": {
@@ -34,10 +35,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2016.09.08",
+        "version": "2016.12.22",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2016.12.18.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2016.12.22.zip"
         }
       }
     },