Merge branch 'release-0.11.0'

.appveyor.yml

@@ -0,0 +1,20 @@
+---
+install:
+  - sc config wuauserv start= auto
+  - net start wuauserv
+  - cinst php composer ffmpeg
+  - refreshenv
+  - copy C:\tools\php72\php.ini-development C:\tools\php72\php.ini
+  - echo extension=C:\tools\php72\ext\php_gmp.dll >> C:\tools\php72\php.ini
+  - echo extension=C:\tools\php72\ext\php_gettext.dll >> C:\tools\php72\php.ini
+  - echo extension=C:\tools\php72\ext\php_intl.dll >> C:\tools\php72\php.ini
+  - echo extension=C:\tools\php72\ext\php_openssl.dll >> C:\tools\php72\php.ini
+  - echo extension=C:\tools\php72\ext\php_mbstring.dll >> C:\tools\php72\php.ini
+  - composer install --no-dev
+  - composer global require phpunit/phpunit
+  - C:\Python36\python.exe -m pip install youtube-dl
+
+test_script:
+  - phpunit
+
+build: "off"

.travis.yml

@@ -1,18 +1,18 @@
 ---
 language: php
-php: 7
+php: 7.1
 addons:
     apt:
         packages:
             - language-pack-fr
 install:
     - composer install
-script: vendor/bin/phpunit
+script: composer exec -v phpunit
 after_success:
     - bash <(curl -s https://codecov.io/bash)
 before_deploy:
     - yarn install --ignore-scripts
-    - ./node_modules/.bin/grunt doc
+    - yarn grunt doc
 deploy:
     provider: surge
     project: ./docs/

CONTRIBUTING.md

@@ -10,4 +10,5 @@ Before opening a new issue, make sure that:
 
 ## Translation
 
-If you want to help translating Alltube in your language, you can join our [POEditor project](https://poeditor.com/join/project/GJmE0wN7Xw).
+If you want to help translating Alltube in your language,
+you can join our [POEditor project](https://poeditor.com/join/project/GJmE0wN7Xw).

Dockerfile

@@ -14,6 +14,6 @@ RUN curl -sS https://getcomposer.org/installer | php
 COPY resources/php.ini /usr/local/etc/php/
 COPY . /var/www/html/
 RUN php composer.phar install --prefer-dist
-RUN yarn install
+RUN yarn install --prod
 RUN ./node_modules/.bin/grunt
 ENV CONVERT=1

Gruntfile.js

@@ -54,7 +54,7 @@ module.exports = function (grunt) {
             },
             phpunit: {
                 options: {
-                    bin: 'php -dzend_extension=xdebug.so ./vendor/bin/phpunit',
+                    bin: 'vendor/bin/phpunit',
                     stopOnError: true,
                     stopOnFailure: true,
                     followOutput: true
@@ -111,7 +111,12 @@ module.exports = function (grunt) {
                 css: {
                     src: 'css/*'
                 }
-            }
+            },
+            markdownlint: {
+                doc: {
+                    src: ['README.md', 'CONTRIBUTING.md', 'resources/*.md']
+                }
+          }
         }
     );
 
@@ -128,9 +133,10 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-fixpack');
     grunt.loadNpmTasks('grunt-potomo');
     grunt.loadNpmTasks('grunt-contrib-csslint');
+    grunt.loadNpmTasks('grunt-markdownlint');
 
     grunt.registerTask('default', ['cssmin', 'potomo']);
-    grunt.registerTask('lint', ['csslint', 'fixpack', 'jsonlint', 'phpcs']);
+    grunt.registerTask('lint', ['csslint', 'fixpack', 'jsonlint', 'markdownlint', 'phpcs']);
     grunt.registerTask('test', ['phpunit']);
     grunt.registerTask('doc', ['phpdocumentor']);
     grunt.registerTask('release', ['default', 'githash', 'compress']);

README.md

@@ -14,7 +14,8 @@ 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 [Yarn](https://yarnpkg.com/) and [Composer](https://getcomposer.org/):
+In order to get AllTube working,
+you need to use [Yarn](https://yarnpkg.com/) and [Composer](https://getcomposer.org/):
 
 ```bash
 yarn install
@@ -23,23 +24,26 @@ 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.)
+(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/
 ```
 
-If your web server is Apache, you need to set the `AllowOverride` setting to `All` or `FileInfo`.
+If your web server is Apache,
+you need to set the `AllowOverride` setting to `All` or `FileInfo`.
 
 #### Update
 
 When updating from Git, you need to run yarn and Composer again:
 
 ```bash
 git pull
-yarn install
+yarn install --prod
 composer install
 ```
 
@@ -126,16 +130,18 @@ server {
 
 ## Other dependencies
 
-You need [avconv](https://libav.org/avconv.html) and [rtmpdump](http://rtmpdump.mplayerhq.hu/) in order to enable conversions.
+You need [avconv](https://libav.org/avconv.html)
+in order to enable conversions.
 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
+sudo apt-get install libav-tools
 ```
 
-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).
+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).
 
 ## Use as library
 

classes/Config.php

@@ -54,13 +54,6 @@ class Config
      */
     public $avconv = 'vendor/bin/ffmpeg';
 
-    /**
-     * rtmpdump binary path.
-     *
-     * @var string
-     */
-    public $rtmpdump = 'vendor/bin/rtmpdump';
-
     /**
      * Disable URL rewriting.
      *
@@ -82,6 +75,21 @@ class Config
      */
     public $remux = false;
 
+    /**
+     * MP3 bitrate when converting (in kbit/s).
+     *
+     * @var int
+     */
+    public $audioBitrate = 128;
+
+    /**
+     * avconv/ffmpeg logging level.
+     * Must be one of these: quiet, panic, fatal, error, warning, info, verbose, debug.
+     *
+     * @var string
+     */
+    public $avconvVerbosity = 'error';
+
     /**
      * YAML config file path.
      *
@@ -96,7 +104,6 @@ class Config
      * * youtubedl: youtube-dl binary path
      * * python: Python binary path
      * * avconv: avconv or ffmpeg binary path
-     * * rtmpdump: rtmpdump binary path
      * * params: Array of youtube-dl parameters
      * * convert: Enable conversion?
      *

classes/Locale.php

@@ -91,7 +91,7 @@ public function getIso3166()
     /**
      * Get country information from locale.
      *
-     * @return \Rinvex\Country\Country
+     * @return \Rinvex\Country\Country|array
      */
     public function getCountry()
     {

classes/LocaleManager.php

@@ -5,7 +5,7 @@
 
 namespace Alltube;
 
-use Symfony\Component\Process\ProcessBuilder;
+use Symfony\Component\Process\Process;
 
 /**
  * Class used to manage locales.
@@ -42,7 +42,6 @@ public function __construct(array $cookies = [])
     {
         $session_factory = new \Aura\Session\SessionFactory();
         $session = $session_factory->newInstance($cookies);
-        $session->setCookieParams(['httponly' => true]);
         $this->sessionSegment = $session->getSegment('Alltube\LocaleManager');
         $cookieLocale = $this->sessionSegment->get('locale');
         if (isset($cookieLocale)) {
@@ -58,8 +57,7 @@ public function __construct(array $cookies = [])
     public function getSupportedLocales()
     {
         $return = [];
-        $builder = new ProcessBuilder(['locale', '-a']);
-        $process = $builder->getProcess();
+        $process = new Process(['locale', '-a']);
         $process->run();
         $installedLocales = explode(PHP_EOL, trim($process->getOutput()));
         foreach ($this->supportedLocales as $supportedLocale) {
@@ -95,4 +93,13 @@ public function setLocale(Locale $locale)
         $this->curLocale = $locale;
         $this->sessionSegment->set('locale', $locale);
     }
+
+    /**
+     * Unset the current locale.
+     */
+    public function unsetLocale()
+    {
+        $this->curLocale = null;
+        $this->sessionSegment->clear();
+    }
 }

classes/PlaylistArchiveStream.php

@@ -61,10 +61,10 @@ class PlaylistArchiveStream extends TarArchive
     /**
      * PlaylistArchiveStream constructor.
      */
-    public function __construct()
+    public function __construct(Config $config = null)
     {
         $this->client = new \GuzzleHttp\Client();
-        $this->download = new VideoDownload();
+        $this->download = new VideoDownload($config);
     }
 
     /**
@@ -78,7 +78,9 @@ protected function send($data)
     {
         $pos = ftell($this->buffer);
         fwrite($this->buffer, $data);
-        fseek($this->buffer, $pos);
+        if ($pos !== false) {
+            fseek($this->buffer, $pos);
+        }
     }
 
     /**
@@ -91,7 +93,10 @@ protected function send($data)
     public function stream_open($path)
     {
         $this->format = ltrim(parse_url($path, PHP_URL_PATH), '/');
-        $this->buffer = fopen('php://temp', 'r+');
+        $buffer = fopen('php://temp', 'r+');
+        if ($buffer !== false) {
+            $this->buffer = $buffer;
+        }
         foreach (explode(';', parse_url($path, PHP_URL_HOST)) as $url) {
             $this->files[] = [
                 'url'         => urldecode($url),
@@ -131,7 +136,7 @@ public function stream_stat()
     /**
      * Called when ftell() is used on the stream.
      *
-     * @return int
+     * @return int|false
      */
     public function stream_tell()
     {
@@ -171,7 +176,7 @@ public function stream_eof()
      *
      * @param int $count Number of bytes to read
      *
-     * @return string
+     * @return string|false
      */
     public function stream_read($count)
     {