From 3283a26edccbd536bc86ca6aac6b7d9c10eb8ab5 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 27 Jul 2016 02:42:12 +0200 Subject: [PATCH 1/5] youtube-dl update --- composer.json | 6 +++--- composer.lock | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 56be992..19d785c 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "project", "require": { "smarty/smarty": "~3.1.29", - "rg3/youtube-dl": "~2016.07.26", + "rg3/youtube-dl": "~2016.07.26.2", "slim/slim": "~3.5.0", "mathmarques/smarty-view": "~1.1.0", "symfony/yaml": "~3.1.0", @@ -30,11 +30,11 @@ "type": "package", "package": { "name": "rg3/youtube-dl", - "version": "2016.07.26", + "version": "2016.07.26.2", "source": { "url": "https://github.com/rg3/youtube-dl.git", "type": "git", - "reference": "2016.07.26" + "reference": "2016.07.26.2" } } }, { diff --git a/composer.lock b/composer.lock index 17a3e32..781a2ce 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2afe3e4c1f053ce8a1dc13887ea3aa8c", - "content-hash": "2c86697f5f04b91631cd33dbedce3179", + "hash": "4bfdfea4d20ddb73ec05b99edcbf25dd", + "content-hash": "7b3b4261846c3cccdcd9e1324ff06f76", "packages": [ { "name": "container-interop/container-interop", @@ -400,11 +400,11 @@ }, { "name": "rg3/youtube-dl", - "version": "2016.07.26", + "version": "2016.07.26.2", "source": { "type": "git", "url": "https://github.com/rg3/youtube-dl.git", - "reference": "2016.07.26" + "reference": "2016.07.26.2" }, "type": "library" }, From a57a493742295cb0140d156e84e6c303d9701b5a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 27 Jul 2016 03:06:06 +0200 Subject: [PATCH 2/5] Make curl follow redirects --- controllers/FrontController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 9eed80f..3087529 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -200,6 +200,7 @@ class FrontController array( 'curl', '--silent', + '--location', '--user-agent', $video->http_headers->{'User-Agent'}, $video->url ), From ae241a9812385c0240523525193111c6efecdbe8 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 27 Jul 2016 13:11:38 +0200 Subject: [PATCH 3/5] curl_params should never be null (fixes #62) --- classes/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Config.php b/classes/Config.php index cd8dea1..c7befdf 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -47,7 +47,7 @@ class Config $yaml = Yaml::parse(file_get_contents($yamlfile)); if (isset($yaml) && is_array($yaml)) { foreach ($yaml as $param => $value) { - if (isset($this->$param)) { + if (isset($this->$param) && isset($value)) { $this->$param = $value; } } From 8e85b28c7a9b937c67e3cd83f54cefa40a5cbed9 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 27 Jul 2016 13:18:33 +0200 Subject: [PATCH 4/5] Correct titles in README --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d1c767d..bf2ff3e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -alltube +Alltube Download ======= HTML GUI for youtube-dl (http://alltubedownload.net/) ![Screenshot](img/screenshot.png "Alltube GUI screenshot") -##Setup +## Setup ### From a release package You can download the latest release package [here](https://github.com/Rudloff/alltube/releases). @@ -28,20 +28,20 @@ You should also ensure that the *templates_c* folder has the right permissions: If your web server is Apache, you need to set the `AllowOverride` setting to `All` or `FileInfo`. -##Config +## Config If you want to use a custom config, you need to create a config file: cp config.example.yml config.yml -##Web server configuration -###Apache +## Web server configuration +### Apache You will need the following modules: * mod_mime * mod_rewrite -###Nginx +### Nginx Here is an exemple Nginx configuration: server { @@ -90,12 +90,12 @@ Here is an exemple Nginx configuration: } -##License +## License This software is available under the [GNU General Public License](http://www.gnu.org/licenses/gpl.html). __Please use a different name and logo if you run it on a public server.__ -##Other dependencies +## Other dependencies You need [avconv](https://libav.org/avconv.html), [rtmpdump](http://rtmpdump.mplayerhq.hu/) and [curl](https://curl.haxx.se/) in order to enable conversions. If you don't want to enable conversions, you can disable it in *config.yml*. From 19136b85f2f9ce85bf157461be2a9d17f5fb496a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 27 Jul 2016 13:20:13 +0200 Subject: [PATCH 5/5] FAQ --- FAQ.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 FAQ.md diff --git a/FAQ.md b/FAQ.md new file mode 100644 index 0000000..59c4b04 --- /dev/null +++ b/FAQ.md @@ -0,0 +1,5 @@ +# Frequently asked questions + +## 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*.