Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock

.gitignore

@@ -10,3 +10,4 @@ alltube-*.zip
 coverage/
 bower_components/
 config.yml
+docs/

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 install:
-    - composer install
+    - composer install --no-dev
-    - npm install
 before_install:
     - composer selfupdate

FAQ.md

@@ -3,3 +3,27 @@
 ## My browser plays the video. How do I download it?
 Most recent browsers automatically play a video if it is a format they know how to play.
 You can ususally download the video by doing *File > Save to* or *ctrl + S*.
+
+## How do I change config parameters?
+You need to create a YAML file called `config.yml` at the root of your project.
+Here are the parameters that you can set:
+* youtubedl: path to your youtube-dl binary
+* python: path to your python binary
+* params: an array of parameters to pass to youtube-dl
+* curl_params: an array of parameters to pass to curl
+* convert: true to enable audio conversion
+* avconv: path to your avconv or ffmpeg binary
+* rtmpdump: path to your rtmpdump binary
+
+See [config.example.yml](config.example.yml) for default values.
+
+## How do I enable audio conversion?
+In order to enable audio conversion, you need to add this to your `config.yml` file:
+```yaml
+convert: true
+avconv: path/to/avconv
+```
+You will also need to install `avconv` and `curl` on your server:
+```bash
+sudo apt-get install libav-tools curl
+```

Gruntfile.js

@@ -34,7 +34,8 @@ module.exports = function (grunt) {
             },
             phpcs: {
                 options: {
-                    standard: 'PSR2'
+                    standard: 'PSR2',
+                    bin: 'vendor/bin/phpcs'
                 },
                 php: {
                     src: ['*.php', 'classes/*.php', 'controllers/*.php']
@@ -52,6 +53,12 @@ module.exports = function (grunt) {
                 }
             },
             phpunit: {
+                options: {
+                    bin: 'php -dzend_extension=xdebug.so ./vendor/bin/phpunit',
+                    stopOnError: true,
+                    stopOnFailure: true,
+                    followOutput: true
+                },
                 classes: {
                     dir: 'tests/'
                 }
@@ -61,7 +68,14 @@ module.exports = function (grunt) {
                     options: {
                         archive: 'alltube-<%= githash.main.tag %>.zip'
                     },
-                    src: ['*.php', '!config.yml', 'dist/**', 'fonts/**', '.htaccess', 'img/**', 'js/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**', '!vendor/ffmpeg/**', '!vendor/bin/ffmpeg']
+                    src: ['*.php', '!config.yml', 'dist/**', '.htaccess', 'img/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**', '!vendor/ffmpeg/**', '!vendor/bin/ffmpeg']
+                }
+            },
+            phpdocumentor: {
+                doc: {
+                    options: {
+                        directory: 'classes/,controllers/,tests/'
+                    }
                 }
             }
         }
@@ -75,9 +89,11 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-phpunit');
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-jslint');
+    grunt.loadNpmTasks('grunt-phpdocumentor');
 
     grunt.registerTask('default', ['uglify', 'cssmin']);
     grunt.registerTask('lint', ['phpcs', 'jslint']);
     grunt.registerTask('test', ['phpunit']);
+    grunt.registerTask('doc', ['phpdocumentor']);
     grunt.registerTask('release', ['default', 'githash', 'compress']);
 };

README.md

@@ -14,25 +14,28 @@ You just have to unzip it on your server and it should be ready to use.
 
 ### From Git
 In order to get AllTube working, you need to use [npm](https://www.npmjs.com/) and [Composer](https://getcomposer.org/):
-
+```bash
-    npm install
+npm install
-    composer install
+composer install
+```
 
 This will download all the required dependencies.
 
 (Note that it will download the ffmpeg binary for 64-bits Linux. If you are on another platform, you might want to specify the path to avconv/ffmpeg in your config file.)
 
 You should also ensure that the *templates_c* folder has the right permissions:
-
+```bash
-    chmod 777 templates_c/
+chmod 777 templates_c/
+```
 
 If your web server is Apache, you need to set the `AllowOverride` setting to `All` or `FileInfo`.
 
 ## Config
 
 If you want to use a custom config, you need to create a config file:
-
+```bash
-    cp config.example.yml config.yml
+cp config.example.yml config.yml
+```
 
 ## Web server configuration
 ### Apache
@@ -43,8 +46,8 @@ You will need the following modules:
 
 ### Nginx
 Here is an exemple Nginx configuration:
-
+```nginx
-    server {
+server {
         server_name localhost;
         listen 443 ssl;
 
@@ -87,8 +90,8 @@ Here is an exemple Nginx configuration:
 
                 include fastcgi_params;
         }
-    }
+}
-
+```
 
 ## License
 This software is available under the [GNU General Public License](http://www.gnu.org/licenses/gpl.html).
@@ -100,7 +103,7 @@ You need [avconv](https://libav.org/avconv.html), [rtmpdump](http://rtmpdump.mpl
 If you don't want to enable conversions, you can disable it in *config.yml*.
 
 On Debian-based systems:
-
+```bash
-    sudo apt-get install libav-tools rtmpdump curl
+sudo apt-get install libav-tools rtmpdump curl
-
+```
 You also probably need to edit the *avconv* variable in *config.yml* so that it points to your ffmpeg/avconv binary (*/usr/bin/avconv* on Debian/Ubuntu).

classes/Config.php

@@ -1,40 +1,68 @@
 <?php
 /**
  * Config class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 namespace Alltube;
 
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * Class to manage config parameters
+ * Manage config parameters
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 class Config
 {
+    /**
+     * Singleton instance
+     * @var Config
+     */
     private static $instance;
 
+    /**
+     * youtube-dl binary path
+     * @var string
+     */
     public $youtubedl = 'vendor/rg3/youtube-dl/youtube_dl/__main__.py';
+
+    /**
+     * python binary path
+     * @var string
+     */
     public $python = '/usr/bin/python';
+
+    /**
+     * youtube-dl parameters
+     * @var array
+     */
     public $params = array('--no-playlist', '--no-warnings', '-f best[protocol^=http]', '--playlist-end', 1);
+
+    /**
+     * Enable audio conversion
+     * @var bool
+     */
     public $convert = false;
+
+    /**
+     * avconv or ffmpeg binary path
+     * @var string
+     */
     public $avconv = 'vendor/bin/ffmpeg';
+
+    /**
+     * rtmpdump binary path
+     * @var string
+     */
     public $rtmpdump = 'vendor/bin/rtmpdump';
+
+    /**
+     * curl binary path
+     * @var string
+     */
+    public $curl = '/usr/bin/curl';
+
+    /**
+     * curl parameters
+     * @var array
+     */
     public $curl_params = array();
 
     /**
@@ -70,4 +98,13 @@ class Config
         }
         return self::$instance;
     }
+
+    /**
+     * Destroy singleton instance
+     * @return void
+     */
+    public static function destroyInstance()
+    {
+        self::$instance = null;
+    }
 }

classes/VideoDownload.php

@@ -1,33 +1,22 @@
 <?php
 /**
  * VideoDownload class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 namespace Alltube;
 
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\ProcessBuilder;
+use Chain\Chain;
 
 /**
- * Main class
+ * Extract info about videos
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 class VideoDownload
 {
+
+    /**
+     * VideoDownload constructor
+     */
     public function __construct()
     {
         $this->config = Config::getInstance();
@@ -43,7 +32,7 @@ class VideoDownload
     /**
      * List all extractors
      *
-     * @return array Extractors
+     * @return string[] Extractors
      * */
     public function listExtractors()
     {
@@ -54,7 +43,7 @@ class VideoDownload
         );
         $process = $this->procBuilder->getProcess();
         $process->run();
-        return explode(PHP_EOL, $process->getOutput());
+        return explode(PHP_EOL, trim($process->getOutput()));
     }
 
     /**
@@ -111,6 +100,145 @@ class VideoDownload
         } else {
             return $process->getOutput();
         }
+    }
 
+    /**
+     * Get filename of video file from URL of page
+     *
+     * @param string $url    URL of page
+     * @param string $format Format to use for the video
+     *
+     * @return string Filename of extracted video
+     * */
+    public function getFilename($url, $format = null)
+    {
+        $this->procBuilder->setArguments(
+            array(
+                '--get-filename',
+                $url
+            )
+        );
+        if (isset($format)) {
+            $this->procBuilder->add('-f '.$format);
+        }
+        $process = $this->procBuilder->getProcess();
+        $process->run();
+        if (!$process->isSuccessful()) {
+            throw new \Exception($process->getErrorOutput());
+        } else {
+            return trim($process->getOutput());
+        }
+    }
+
+    /**
+     * Get filename of audio from URL of page
+     *
+     * @param string $url    URL of page
+     * @param string $format Format to use for the video
+     *
+     * @return string Filename of converted audio file
+     * */
+    public function getAudioFilename($url, $format = null)
+    {
+        return html_entity_decode(
+            pathinfo(
+                $this->getFilename($url, $format),
+                PATHINFO_FILENAME
+            ).'.mp3',
+            ENT_COMPAT,
+            'ISO-8859-1'
+        );
+    }
+
+    /**
+     * Get audio stream of converted video
+     *
+     * @param string $url    URL of page
+     * @param string $format Format to use for the video
+     *
+     * @return resource popen stream
+     */
+    public function getAudioStream($url, $format)
+    {
+        if (!shell_exec('which '.$this->config->avconv)) {
+            throw(new \Exception('Can\'t find avconv or ffmpeg'));
+        }
+
+        $video = $this->getJSON($url, $format);
+
+        //Vimeo needs a correct user-agent
+        ini_set(
+            'user_agent',
+            $video->http_headers->{'User-Agent'}
+        );
+        $avconvProc = ProcessBuilder::create(
+            array(
+                $this->config->avconv,
+                '-v', 'quiet',
+                '-i', '-',
+                '-f', 'mp3',
+                '-vn',
+                'pipe:1'
+            )
+        );
+
+        if (parse_url($video->url, PHP_URL_SCHEME) == 'rtmp') {
+            if (!shell_exec('which '.$this->config->rtmpdump)) {
+                throw(new \Exception('Can\'t find rtmpdump'));
+            }
+            $builder = new ProcessBuilder(
+                array(
+                    $this->config->rtmpdump,
+                    '-q',
+                    '-r',
+                    $video->url,
+                    '--pageUrl', $video->webpage_url
+                )
+            );
+            if (isset($video->player_url)) {
+                $builder->add('--swfVfy');
+                $builder->add($video->player_url);
+            }
+            if (isset($video->flash_version)) {
+                $builder->add('--flashVer');
+                $builder->add($video->flash_version);
+            }
+            if (isset($video->play_path)) {
+                $builder->add('--playpath');
+                $builder->add($video->play_path);
+            }
+            if (isset($video->rtmp_conn)) {
+                foreach ($video->rtmp_conn as $conn) {
+                    $builder->add('--conn');
+                    $builder->add($conn);
+                }
+            }
+            if (isset($video->app)) {
+                $builder->add('--app');
+                $builder->add($video->app);
+            }
+            $chain = new Chain($builder->getProcess());
+            $chain->add('|', $avconvProc);
+        } else {
+            if (!shell_exec('which '.$this->config->curl)) {
+                throw(new \Exception('Can\'t find curl'));
+            }
+            $chain = new Chain(
+                ProcessBuilder::create(
+                    array_merge(
+                        array(
+                            $this->config->curl,
+                            '--silent',
+                            '--location',
+                            '--user-agent', $video->http_headers->{'User-Agent'},
+                            $video->url
+                        ),
+                        $this->config->curl_params
+                    )
+                )
+            );
+            $chain->add('|', $avconvProc);
+        }
+        return popen($chain->getProcess()->getCommandLine(), 'r');
     }
 }

composer.json

@@ -6,7 +6,7 @@
 	"type": "project",
 	"require": {
 		"smarty/smarty": "~3.1.29",
-		"rg3/youtube-dl": "~2016.07.26.2",
+		"rg3/youtube-dl": "~2016.08.12",
 		"slim/slim": "~3.5.0",
 		"mathmarques/smarty-view": "~1.1.0",
 		"symfony/yaml": "~3.1.0",
@@ -18,7 +18,9 @@
 		"rudloff/rtmpdump-bin": "~2.3"
 	},
 	"require-dev": {
-		"symfony/var-dumper": "~3.1.0"
+		"symfony/var-dumper": "~3.1.0",
+		"squizlabs/php_codesniffer": "~2.6.2",
+		"phpunit/phpunit": "~5.4.8"
 	},
 	"extra": {
 		"paas": {
@@ -31,11 +33,11 @@
 		"type": "package",
 		"package": {
 			"name": "rg3/youtube-dl",
-			"version": "2016.07.26.2",
+			"version": "2016.08.12",
 			"source": {
 				"url": "https://github.com/rg3/youtube-dl.git",
 				"type": "git",
-				"reference": "2016.07.26.2"
+				"reference": "2016.08.12"
 			}
 		}
 	}, {

config.example.yml

@@ -10,3 +10,4 @@ curl_params:
 convert: false
 avconv: vendor/bin/ffmpeg
 rtmpdump: vendor/bin/rtmpdump
+curl: /usr/bin/curl

controllers/FrontController.php

@@ -1,39 +1,44 @@
 <?php
 /**
  * FrontController class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 namespace Alltube\Controller;
 
 use Alltube\VideoDownload;
 use Alltube\Config;
-use Symfony\Component\Process\ProcessBuilder;
-use Chain\Chain;
 use Slim\Http\Stream;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use Slim\Container;
 
 /**
  * Main controller
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 class FrontController
 {
-    public function __construct($container)
+    /**
+     * Config instance
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * VideoDownload instance
+     * @var VideoDownload
+     */
+    private $download;
+
+    /**
+     * Slim dependency container
+     * @var Container
+     */
+    private $container;
+
+    /**
+     * FrontController constructor
+     * @param Container $container Slim dependency container
+     */
+    public function __construct(Container $container)
     {
         $this->config = Config::getInstance();
         $this->download = new VideoDownload();
@@ -52,24 +57,13 @@ class FrontController
     {
         $this->container->view->render(
             $response,
-            'head.tpl',
+            'index.tpl',
             array(
+                'convert'=>$this->config->convert,
                 'class'=>'index',
                 'description'=>'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.'
             )
         );
-        $this->container->view->render(
-            $response,
-            'header.tpl'
-        );
-        $this->container->view->render(
-            $response,
-            'index.tpl',
-            array(
-                'convert'=>$this->config->convert
-            )
-        );
-        $this->container->view->render($response, 'footer.tpl');
     }
 
     /**
@@ -84,24 +78,15 @@ class FrontController
     {
         $this->container->view->render(
             $response,
-            'head.tpl',
+            'extractors.tpl',
             array(
+                'extractors'=>$this->download->listExtractors(),
                 'class'=>'extractors',
                 'title'=>'Supported websites',
                 'description'
                     =>'List of all supported websites from which Alltube Download can extract video or audio files'
             )
         );
-        $this->container->view->render($response, 'header.tpl');
-        $this->container->view->render($response, 'logo.tpl');
-        $this->container->view->render(
-            $response,
-            'extractors.tpl',
-            array(
-                'extractors'=>$this->download->listExtractors()
-            )
-        );
-        $this->container->view->render($response, 'footer.tpl');
     }
 
     /**
@@ -110,7 +95,7 @@ class FrontController
      * @param Request  $request  PSR-7 request
      * @param Response $response PSR-7 response
      *
-     * @return void
+     * @return Response HTTP response
      */
     public function video(Request $request, Response $response)
     {
@@ -121,96 +106,16 @@ class FrontController
                 try {
                     return $this->getStream($params["url"], 'mp3[protocol^=http]', $response, $request);
                 } catch (\Exception $e) {
-                    $video = $this->download->getJSON($params["url"], 'bestaudio/best');
-
-                    if (!shell_exec('which '.$this->config->avconv)) {
-                        throw(new \Exception('Can\'t find avconv or ffmpeg'));
-                    }
-
-                    $avconvProc = ProcessBuilder::create(
-                        array(
-                            $this->config->avconv,
-                            '-v', 'quiet',
-                            '-i', '-',
-                            '-f', 'mp3',
-                            '-vn',
-                            'pipe:1'
-                        )
-                    );
-
-                    //Vimeo needs a correct user-agent
-                    ini_set(
-                        'user_agent',
-                        $video->http_headers->{'User-Agent'}
-                    );
-
                     $response = $response->withHeader(
                         'Content-Disposition',
                         'attachment; filename="'.
-                        html_entity_decode(
+                        $this->download->getAudioFilename($params["url"], 'bestaudio/best').'"'
-                            pathinfo(
-                                $video->_filename,
-                                PATHINFO_FILENAME
-                            ).'.mp3',
-                            ENT_COMPAT,
-                            'ISO-8859-1'
-                        ).'"'
                     );
                     $response = $response->withHeader('Content-Type', 'audio/mpeg');
 
-                    if (parse_url($video->url, PHP_URL_SCHEME) == 'rtmp') {
-                        if (!shell_exec('which '.$this->config->rtmpdump)) {
-                            throw(new \Exception('Can\'t find rtmpdump'));
-                        }
-                        $builder = new ProcessBuilder(
-                            array(
-                                $this->config->rtmpdump,
-                                '-q',
-                                '-r',
-                                $video->url,
-                                '--pageUrl', $video->webpage_url
-                            )
-                        );
-                        if (isset($video->player_url)) {
-                            $builder->add('--swfVfy');
-                            $builder->add($video->player_url);
-                        }
-                        if (isset($video->flash_version)) {
-                            $builder->add('--flashVer');
-                            $builder->add($video->flash_version);
-                        }
-                        if (isset($video->play_path)) {
-                            $builder->add('--playpath');
-                            $builder->add($video->play_path);
-                        }
-                        foreach ($video->rtmp_conn as $conn) {
-                            $builder->add('--conn');
-                            $builder->add($conn);
-                        }
-                        $chain = new Chain($builder->getProcess());
-                        $chain->add('|', $avconvProc);
-                    } else {
-                        if (!shell_exec('which curl')) {
-                            throw(new \Exception('Can\'t find curl'));
-                        }
-                        $chain = new Chain(
-                            ProcessBuilder::create(
-                                array_merge(
-                                    array(
-                                        'curl',
-                                        '--silent',
-                                        '--location',
-                                        '--user-agent', $video->http_headers->{'User-Agent'},
-                                        $video->url
-                                    ),
-                                    $this->config->curl_params
-                                )
-                            )
-                        );
-                        $chain->add('|', $avconvProc);
-                    }
                     if ($request->isGet()) {
-                        $response = $response->withBody(new Stream(popen($chain->getProcess()->getCommandLine(), 'r')));
+                        $process = $this->download->getAudioStream($params["url"], 'bestaudio/best');
+                        $response = $response->withBody(new Stream($process));
                     }
                     return $response;
                 }
@@ -218,45 +123,38 @@ class FrontController
                 $video = $this->download->getJSON($params["url"]);
                 $this->container->view->render(
                     $response,
-                    'head.tpl',
+                    'video.tpl',
                     array(
+                        'video'=>$video,
                         'class'=>'video',
                         'title'=>$video->title,
                         'description'=>'Download "'.$video->title.'" from '.$video->extractor_key
                     )
                 );
-                $this->container->view->render(
-                    $response,
-                    'video.tpl',
-                    array(
-                        'video'=>$video
-                    )
-                );
-                $this->container->view->render($response, 'footer.tpl');
             }
         } else {
             return $response->withRedirect($this->container->get('router')->pathFor('index'));
         }
     }
 
+    /**
+     * Display an error page
+     * @param  Request   $request   PSR-7 request
+     * @param  Response  $response  PSR-7 response
+     * @param  \Exception $exception Error to display
+     * @return Response HTTP response
+     */
     public function error(Request $request, Response $response, \Exception $exception)
     {
         $this->container->view->render(
             $response,
-            'head.tpl',
+            'error.tpl',
             array(
+                'errors'=>$exception->getMessage(),
                 'class'=>'video',
                 'title'=>'Error'
             )
         );
-        $this->container->view->render(
-            $response,
-            'error.tpl',
-            array(
-                'errors'=>$exception->getMessage()
-            )
-        );
-        $this->container->view->render($response, 'footer.tpl');
         return $response->withStatus(500);
     }
 
@@ -283,7 +181,7 @@ class FrontController
      * @param Request  $request  PSR-7 request
      * @param Response $response PSR-7 response
      *
-     * @return void
+     * @return Response HTTP response
      */
     public function redirect(Request $request, Response $response)
     {
@@ -304,7 +202,7 @@ class FrontController
      * @param Request  $request  PSR-7 request
      * @param Response $response PSR-7 response
      *
-     * @return void
+     * @return Response HTTP response
      */
     public function json(Request $request, Response $response)
     {

index.php

@@ -1,17 +1,4 @@
 <?php
-/**
- * PHP web interface for youtube-dl (http://rg3.github.com/youtube-dl/)
- * Index page
- *
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @author   Olivier Haquette <contact@olivierhaquette.fr>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 require_once __DIR__.'/vendor/autoload.php';
 use Alltube\VideoDownload;
 use Alltube\Controller\FrontController;

package.json

@@ -6,14 +6,17 @@
         "grunt": "~1.0.1",
         "grunt-cli": "~1.2.0",
         "grunt-contrib-cssmin": "~1.0.0",
-        "grunt-contrib-uglify": "~1.0.0",
+        "grunt-contrib-uglify": "~2.0.0",
+        "bower": "~1.7.1"
+    },
+    "devDependencies": {
         "grunt-contrib-watch": "~1.0.0",
         "grunt-phpcs": "~0.4.0",
         "grunt-phpunit": "~0.3.6",
         "grunt-contrib-compress": "~1.3.0",
-        "bower": "~1.7.1",
         "grunt-githash": "~0.1.3",
-        "grunt-jslint": "~1.1.14"
+        "grunt-jslint": "~1.1.14",
+        "grunt-phpdocumentor": "~0.4.1"
     },
     "repository": {
         "type": "git",

templates/error.tpl

@@ -1,6 +1,7 @@
+{include file='inc/head.tpl'}
 <div class="wrapper">
     <div class="main error">
-    {include file="logo.tpl"}
+    {include file="inc/logo.tpl"}
     <h2>An error occured</h2>
     Please check the URL of your video.
     <p><i>
@@ -9,4 +10,5 @@
         <br/>
     {/foreach}
     </i></p>
-    </div>
+</div>
+{include file='inc/footer.tpl'}

templates/extractors.tpl

@@ -1,3 +1,6 @@
+{include file='inc/head.tpl'}
+{include file='inc/header.tpl'}
+{include file='inc/logo.tpl'}
 <h2 class="titre">Supported websites</h2>
 <div class="tripleliste">
         <ul>
@@ -6,3 +9,4 @@
             {/foreach}
         </ul>
 </div>
+{include file='inc/footer.tpl'}

templates/index.tpl

@@ -1,4 +1,6 @@
-    <div class="main">
+{include file='inc/head.tpl'}
+{include file='inc/header.tpl'}
+<div class="main">
     <div><img class="logo" src="{base_url|noscheme}/img/logo.png"
     alt="AllTube Download" width="328" height="284"></div>
     <form action="{path_for name="video"}">
@@ -27,3 +29,4 @@
     </div>
 
 </div>
+{include file='inc/footer.tpl'}

templates/video.tpl

@@ -1,7 +1,8 @@
+{include file="inc/head.tpl"}
 <div class="wrapper">
 <div itemscope itemtype="http://schema.org/VideoObject">
 <div class="main">
-{include file="logo.tpl"}
+{include file="inc/logo.tpl"}
 <p id="download_intro">You are going to download<i itemprop="name">
     <a itemprop="url" id="video_link"
         data-ext="{$video->ext}"
@@ -86,3 +87,4 @@
 {/if}
 </div>
 </div>
+{include file="inc/footer.tpl"}

tests/ConfigTest.php

@@ -1,30 +1,14 @@
 <?php
 /**
  * ConfigTest class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 namespace Alltube\Test;
 
 use Alltube\Config;
 
 /**
  * Unit tests for the Config class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
 
@@ -38,5 +22,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
         putenv('CONVERT=1');
         $config = Config::getInstance();
         $this->assertEquals($config->convert, true);
+        $this->assertInternalType('array', $config->curl_params);
+        $this->assertInternalType('array', $config->params);
+        $this->assertInternalType('string', $config->youtubedl);
+        $this->assertInternalType('string', $config->python);
+        $this->assertInternalType('string', $config->avconv);
+        $this->assertInternalType('string', $config->rtmpdump);
     }
 }

tests/VideoDownloadTest.php

@@ -1,37 +1,38 @@
 <?php
 /**
  * VideoDownloadTest class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 namespace Alltube\Test;
 
 use Alltube\VideoDownload;
 
 /**
  * Unit tests for the VideoDownload class
- *
+ */
- * PHP Version 5.3.10
- *
- * @category Youtube-dl
- * @package  Youtubedl
- * @author   Pierre Rudloff <contact@rudloff.pro>
- * @license  GNU General Public License http://www.gnu.org/licenses/gpl.html
- * @link     http://rudloff.pro
- * */
 class VideoDownloadTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * VideoDownload instance
+     * @var VideoDownload
+     */
+    private $download;
+
+    /**
+     * Initialize properties used by test
+     */
     protected function setUp()
     {
         $this->download = new VideoDownload();
     }
 
+    /**
+     * Destroy properties after test
+     */
+    protected function tearDown()
+    {
+        \Alltube\Config::destroyInstance();
+    }
+
     /**
      * Test listExtractors function
      *
@@ -48,6 +49,8 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
      *
      * @param string $url    URL
      * @param string $format Format
+     * @param string $filename Filename
+     * @param string $domain Domain
      *
      * @return       void
      * @dataProvider urlProvider
@@ -75,7 +78,7 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
     /**
      * Provides URLs for tests
      *
-     * @return array
+     * @return array[]
      */
     public function urlProvider()
     {
@@ -83,26 +86,42 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
             array(
                 'https://www.youtube.com/watch?v=M7IpKCZ47pU', null,
                 "It's Not Me, It's You - Hearts Under Fire-M7IpKCZ47pU.mp4",
-                'googlevideo.com'
+                'googlevideo.com',
+                "It's Not Me, It's You - Hearts Under Fire-M7IpKCZ47pU.mp3"
             ),
             array(
                 'https://www.youtube.com/watch?v=RJJ6FCAXvKg', 22,
                 "'Heart Attack' - Demi Lovato ".
                 "(Sam Tsui & Against The Current)-RJJ6FCAXvKg.mp4",
-                'googlevideo.com'
+                'googlevideo.com',
+                "'Heart Attack' - Demi Lovato ".
+                "(Sam Tsui & Against The Current)-RJJ6FCAXvKg.mp3"
             ),
             array(
                 'https://vimeo.com/24195442', null,
                 "Carving the Mountains-24195442.mp4",
-                'vimeocdn.com'
+                'vimeocdn.com',
+                "Carving the Mountains-24195442.mp3"
             ),
+            array(
+                'http://www.bbc.co.uk/programmes/b039g8p7', 'bestaudio/best',
+                "Leonard Cohen, Kaleidoscope - BBC Radio 4-b039d07m.flv",
+                'bbcodspdns.fcod.llnwd.net',
+                "Leonard Cohen, Kaleidoscope - BBC Radio 4-b039d07m.mp3"
+            ),
+            array(
+                'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0', 'bestaudio/best',
+                "GRIP sucht den Sommerkönig-folge-203-0.f4v",
+                'edgefcs.net',
+                "GRIP sucht den Sommerkönig-folge-203-0.mp3"
+            )
         );
     }
 
     /**
      * Provides incorrect URLs for tests
      *
-     * @return array
+     * @return array[]
      */
     public function errorUrlProvider()
     {
@@ -144,4 +163,103 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
     {
         $videoURL = $this->download->getJSON($url);
     }
+
+    /**
+     * Test getFilename function
+     *
+     * @param string $url    URL
+     * @param string $format Format
+     * @param string $filename Filename
+     *
+     * @return       void
+     * @dataProvider urlProvider
+     */
+    public function testGetFilename($url, $format, $filename)
+    {
+        $videoFilename = $this->download->getFilename($url, $format);
+        $this->assertEquals($videoFilename, $filename);
+    }
+
+    /**
+     * Test getFilename function errors
+     *
+     * @param string $url URL
+     *
+     * @return            void
+     * @expectedException Exception
+     * @dataProvider      ErrorUrlProvider
+     */
+    public function testGetFilenameError($url)
+    {
+        $this->download->getFilename($url);
+    }
+
+    /**
+     * Test getAudioFilename function
+     *
+     * @param string $url    URL
+     * @param string $format Format
+     * @param string $filename Filename
+     * @param string $domain Domain
+     * @param string $audioFilename MP3 audio file name
+     *
+     * @return       void
+     * @dataProvider urlProvider
+     */
+    public function testGetAudioFilename($url, $format, $filename, $domain, $audioFilename)
+    {
+        $videoFilename = $this->download->getAudioFilename($url, $format);
+        $this->assertEquals($videoFilename, $audioFilename);
+    }
+
+    /**
+     * Test getAudioStream function
+     *
+     * @param string $url    URL
+     * @param string $format Format
+     *
+     * @return       void
+     * @dataProvider urlProvider
+     */
+    public function testGetAudioStream($url, $format)
+    {
+        $stream = $this->download->getAudioStream($url, $format);
+        $this->assertInternalType('resource', $stream);
+        $this->assertFalse(feof($stream));
+    }
+
+    /**
+     * Test getAudioStream function without avconv
+     *
+     * @param string $url    URL
+     * @param string $format Format
+     *
+     * @return            void
+     * @expectedException Exception
+     * @dataProvider      urlProvider
+     */
+    public function testGetAudioStreamAvconvError($url, $format)
+    {
+        $config = \Alltube\Config::getInstance();
+        $config->avconv = 'foobar';
+        $this->download->getAudioStream($url, $format);
+    }
+
+    /**
+     * Test getAudioStream function without curl or rtmpdump
+     *
+     * @param string $url    URL
+     * @param string $format Format
+     *
+     * @return            void
+     * @expectedException Exception
+     * @dataProvider      urlProvider
+     */
+    public function testGetAudioStreamCurlError($url, $format)
+    {
+        $config = \Alltube\Config::getInstance();
+        $config->curl = 'foobar';
+        $config->rtmpdump = 'foobar';
+        $this->download->getAudioStream($url, $format);
+    }
 }