Merge branch 'develop' into feature/stream

This commit is contained in:
Pierre Rudloff 2016-10-14 02:47:21 +02:00
commit 5c4caf359f

View file

@ -12,7 +12,18 @@ use Symfony\Component\Process\ProcessBuilder;
*/
class VideoDownload
{
/**
* Config instance.
*
* @var Config
*/
private $config;
/**
* ProcessBuilder instance used to call Python.
*
* @var ProcessBuilder
*/
private $procBuilder;
/**
@ -48,6 +59,15 @@ class VideoDownload
return explode(PHP_EOL, trim($process->getOutput()));
}
/**
* Get a property from youtube-dl.
*
* @param string $url URL to parse
* @param string $format Format
* @param string $prop Property
*
* @return string
*/
private function getProp($url, $format = null, $prop = 'dump-json')
{
$this->procBuilder->setArguments(