genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-07-27 13:21:18 +02:00
commit 29cf3160a0
6 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
FAQ.md Normal file
View file

@ -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*.

2
README.md
View file

@ -1,4 +1,4 @@
alltube Alltube Download
======= =======
HTML GUI for youtube-dl (http://alltubedownload.net/) HTML GUI for youtube-dl (http://alltubedownload.net/)

2
classes/Config.php
View file

@ -47,7 +47,7 @@ class Config
$yaml = Yaml::parse(file_get_contents($yamlfile)); $yaml = Yaml::parse(file_get_contents($yamlfile));
if (isset($yaml) && is_array($yaml)) { if (isset($yaml) && is_array($yaml)) {
foreach ($yaml as $param => $value) { foreach ($yaml as $param => $value) {
if (isset($this->$param)) { if (isset($this->$param) && isset($value)) {
$this->$param = $value; $this->$param = $value;
} }
} }

6
composer.json
View file

@ -6,7 +6,7 @@
"type": "project", "type": "project",
"require": { "require": {
"smarty/smarty": "~3.1.29", "smarty/smarty": "~3.1.29",
"rg3/youtube-dl": "~2016.07.26", "rg3/youtube-dl": "~2016.07.26.2",
"slim/slim": "~3.5.0", "slim/slim": "~3.5.0",
"mathmarques/smarty-view": "~1.1.0", "mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.1.0", "symfony/yaml": "~3.1.0",
@ -31,11 +31,11 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2016.07.26", "version": "2016.07.26.2",
"source": { "source": {
"url": "https://github.com/rg3/youtube-dl.git", "url": "https://github.com/rg3/youtube-dl.git",
"type": "git", "type": "git",
"reference": "2016.07.26" "reference": "2016.07.26.2"
} }
} }
}, { }, {

8
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "3f4935b8a1ed3005a51f97b4da89cb34", "hash": "c4eb7b9cf1322b024130fba8517794f3",
"content-hash": "9f3900f56384d5e60c097ca719c0af08", "content-hash": "3608a48b9ac14ccba68577310338f6b7",
"packages": [ "packages": [
{ {
"name": "container-interop/container-interop", "name": "container-interop/container-interop",
@ -571,11 +571,11 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2016.07.26", "version": "2016.07.26.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/rg3/youtube-dl.git", "url": "https://github.com/rg3/youtube-dl.git",
"reference": "2016.07.26" "reference": "2016.07.26.2"
}, },
"type": "library" "type": "library"
}, },

1
controllers/FrontController.php
View file

@ -199,6 +199,7 @@ class FrontController
array( array(
'curl', 'curl',
'--silent', '--silent',
'--location',
'--user-agent', $video->http_headers->{'User-Agent'}, '--user-agent', $video->http_headers->{'User-Agent'},
$video->url $video->url
), ),