From ac4f6e72b8f0db95bb986195c73c28dab867622c Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sat, 19 May 2018 16:16:20 +0200
Subject: [PATCH 1/8] fix: Remove empty format from format list

Introduced by 4972c8ab8e1e9a4899b5f8b371342ca494bc0487

Fixes #170
---
 templates/video.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/video.tpl b/templates/video.tpl
index f2c2814..cdf4242 100644
--- a/templates/video.tpl
+++ b/templates/video.tpl
@@ -79,7 +79,6 @@
                     {/if}
                 {/foreach}
             </optgroup>
-            <option value="{$format->format_id}">
         </select><br/><br/>
         {if $config->convertAdvanced}
             <input type="checkbox" name="customConvert" id="customConvert"/>

From 647eed9db0ca49ed5a44166a7dd9a865f88530e8 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 23 May 2018 21:43:34 +0200
Subject: [PATCH 2/8] fix: Run youtube-dl with --no-playlist

Fixes #172
---
 classes/Config.php        | 2 +-
 config/config.example.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Config.php b/classes/Config.php
index 8cef263..0a06d55 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -39,7 +39,7 @@ class Config
      *
      * @var array
      */
-    public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist', '--restrict-filenames'];
+    public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist', '--restrict-filenames', '--no-playlist'];
 
     /**
      * Enable audio conversion.
diff --git a/config/config.example.yml b/config/config.example.yml
index c616db5..529fdba 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -11,6 +11,7 @@ params:
     - --ignore-errors
     - --flat-playlist
     - --restrict-filenames
+    - --no-playlist
 
 # True to enable audio conversion
 convert: false

From 17b9185e535a9a8e7577f007a0db85821fb70708 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 23 May 2018 21:50:06 +0200
Subject: [PATCH 3/8] fix: Throw an error when trying to convert a playlist

---
 classes/VideoDownload.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/classes/VideoDownload.php b/classes/VideoDownload.php
index 636f550..4235980 100644
--- a/classes/VideoDownload.php
+++ b/classes/VideoDownload.php
@@ -152,7 +152,13 @@ class VideoDownload
      * */
     public function getURL($url, $format = null, $password = null)
     {
-        return explode("\n", $this->getProp($url, $format, 'get-url', $password));
+        $urls = explode("\n", $this->getProp($url, $format, 'get-url', $password));
+
+        if (empty($urls[0])) {
+            throw new Exception(_('youtube-dl returned an empty URL.'));
+        }
+
+        return $urls;
     }
 
     /**
@@ -325,6 +331,11 @@ class VideoDownload
     public function getAudioStream($url, $format, $password = null)
     {
         $video = $this->getJSON($url, $format, $password);
+
+        if (isset($video->_type) && $video->_type == 'playlist') {
+            throw new Exception(_('Conversion of playlists is not supported.'));
+        }
+
         if (in_array($video->protocol, ['m3u8', 'm3u8_native'])) {
             throw new Exception(_('Conversion of M3U8 files is not supported.'));
         } elseif ($video->protocol == 'http_dash_segments') {

From edf4d4644dcb53c542809ff7330a2fa16e2978c9 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 23 May 2018 22:38:15 +0200
Subject: [PATCH 4/8] fix: Fix downloading a playlist as a TAR archive

This is the only time where youtube-dl returning an empty URL is not a problem.
---
 classes/EmptyUrlException.php   | 15 +++++++++++++++
 classes/VideoDownload.php       |  2 +-
 controllers/FrontController.php | 19 ++++++++++++++-----
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 classes/EmptyUrlException.php

diff --git a/classes/EmptyUrlException.php b/classes/EmptyUrlException.php
new file mode 100644
index 0000000..663501c
--- /dev/null
+++ b/classes/EmptyUrlException.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * EmptyUrlException class.
+ */
+
+namespace Alltube;
+
+use Exception;
+
+/**
+ * Exception thrown when youtube-dl returns an empty URL.
+ */
+class EmptyUrlException extends Exception
+{
+}
diff --git a/classes/VideoDownload.php b/classes/VideoDownload.php
index 4235980..d357b0b 100644
--- a/classes/VideoDownload.php
+++ b/classes/VideoDownload.php
@@ -155,7 +155,7 @@ class VideoDownload
         $urls = explode("\n", $this->getProp($url, $format, 'get-url', $password));
 
         if (empty($urls[0])) {
-            throw new Exception(_('youtube-dl returned an empty URL.'));
+            throw new EmptyUrlException(_('youtube-dl returned an empty URL.'));
         }
 
         return $urls;
diff --git a/controllers/FrontController.php b/controllers/FrontController.php
index aa07473..1c9dba2 100644
--- a/controllers/FrontController.php
+++ b/controllers/FrontController.php
@@ -6,6 +6,7 @@
 namespace Alltube\Controller;
 
 use Alltube\Config;
+use Alltube\EmptyUrlException;
 use Alltube\Locale;
 use Alltube\LocaleManager;
 use Alltube\PasswordException;
@@ -456,11 +457,19 @@ class FrontController
      */
     private function getRedirectResponse($url, $format, Response $response, Request $request)
     {
-        $videoUrls = $this->download->getURL(
-            $url,
-            $format,
-            $this->sessionSegment->getFlash($url)
-        );
+        try {
+            $videoUrls = $this->download->getURL(
+                $url,
+                $format,
+                $this->sessionSegment->getFlash($url)
+            );
+        } catch (EmptyUrlException $e) {
+            /*
+            If this happens it is probably a playlist
+            so it will either be handle by getStream() or throw an exception anyway.
+             */
+            $videoUrls = [];
+        }
         if (count($videoUrls) > 1) {
             return $this->getRemuxStream($videoUrls, $format, $response, $request);
         } elseif ($this->config->stream) {

From 1d4a1ac65cabd1d527f580f77659080004bc1296 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 23 May 2018 22:52:15 +0200
Subject: [PATCH 5/8] test: Test getAudioStream() with a playlist

---
 tests/VideoDownloadTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/VideoDownloadTest.php b/tests/VideoDownloadTest.php
index 2b576ac..998e37b 100644
--- a/tests/VideoDownloadTest.php
+++ b/tests/VideoDownloadTest.php
@@ -417,6 +417,17 @@ class VideoDownloadTest extends TestCase
         $this->download->getAudioStream('https://vimeo.com/251997032', 'bestaudio/best');
     }
 
+    /**
+     * Test getAudioStream function with a playlist.
+     *
+     * @return void
+     * @expectedException Exception
+     */
+    public function testGetAudioStreamPlaylistError()
+    {
+        $this->download->getAudioStream('https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC', 'best');
+    }
+
     /**
      * Assert that a stream is valid.
      *

From a9ed417733c875c6709dcebcafb3ebab3a8b3c18 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sat, 26 May 2018 14:38:17 +0200
Subject: [PATCH 6/8] docs: Add Liberapay link to README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index efb526d..ce11b4f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # AllTube Download
 
+[![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Rudloff/donate)
+
 HTML GUI for youtube-dl ([alltubedownload.net](http://alltubedownload.net/))
 
 ![Screenshot](img/screenshot.png "AllTube GUI screenshot")

From 86523fd44b89c21a2747eb22d5a7782eff7ba247 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sat, 26 May 2018 14:38:42 +0200
Subject: [PATCH 7/8] style: Lint

---
 tests/VideoDownloadTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/VideoDownloadTest.php b/tests/VideoDownloadTest.php
index 998e37b..4d3fae9 100644
--- a/tests/VideoDownloadTest.php
+++ b/tests/VideoDownloadTest.php
@@ -425,7 +425,10 @@ class VideoDownloadTest extends TestCase
      */
     public function testGetAudioStreamPlaylistError()
     {
-        $this->download->getAudioStream('https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC', 'best');
+        $this->download->getAudioStream(
+            'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC',
+            'best'
+        );
     }
 
     /**

From 2fc1cd319f8eb259dda106a9e433cc355d1d46fd Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sat, 26 May 2018 14:46:29 +0200
Subject: [PATCH 8/8] build(yarn): 1.1.2 release

Bump version number
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a2a07c..bbec7a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alltube",
   "description": "HTML GUI for youtube-dl",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": "Pierre Rudloff",
   "bugs": "https://github.com/Rudloff/alltube/issues",
   "dependencies": {