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

Don't use static functions

Browse source
This commit is contained in:
Pierre Rudloff 2016-04-08 19:06:41 +02:00
parent 7eef219128
commit 11e8243443
4 changed files with 64 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

40
classes/VideoDownload.php
View file

@ -27,17 +27,21 @@ use Symfony\Component\Process\Process;
* */
class VideoDownload
{
public function __construct()
{
$this->config = Config::getInstance();
}
/**
* Get the user agent used youtube-dl
*
* @return string UA
* */
public static function getUA()
public function getUA()
{
$config = Config::getInstance();
$cmd = escapeshellcmd(
$config->python.' '.escapeshellarg($config->youtubedl).
' '.$config->params
$this->config->python.' '.escapeshellarg($this->config->youtubedl).
' '.$this->config->params
);
$process = new Process($cmd.' --dump-user-agent');
$process->run();
@ -49,12 +53,11 @@ class VideoDownload
*
* @return array Extractors
* */
public static function listExtractors()
public function listExtractors()
{
$config = Config::getInstance();
$cmd = escapeshellcmd(
$config->python.' '.escapeshellarg($config->youtubedl).
' '.$config->params
$this->config->python.' '.escapeshellarg($this->config->youtubedl).
' '.$this->config->params
);
$process = new Process($cmd.' --list-extractors');
$process->run();
@ -69,12 +72,11 @@ class VideoDownload
*
* @return string Filename
* */
public static function getFilename($url, $format = null)
public function getFilename($url, $format = null)
{
$config = Config::getInstance();
$cmd = escapeshellcmd(
$config->python.' '.escapeshellarg($config->youtubedl).
' '.$config->params
$this->config->python.' '.escapeshellarg($this->config->youtubedl).
' '.$this->config->params
);
if (isset($format)) {
$cmd .= ' -f '.escapeshellarg($format);
@ -93,12 +95,11 @@ class VideoDownload
*
* @return string JSON
* */
public static function getJSON($url, $format = null)
public function getJSON($url, $format = null)
{
$config = Config::getInstance();
$cmd = escapeshellcmd(
$config->python.' '.escapeshellarg($config->youtubedl).
' '.$config->params
$this->config->python.' '.escapeshellarg($this->config->youtubedl).
' '.$this->config->params
);
if (isset($format)) {
$cmd .= ' -f '.escapeshellarg($format);
@ -121,12 +122,11 @@ class VideoDownload
*
* @return string URL of video
* */
public static function getURL($url, $format = null)
public function getURL($url, $format = null)
{
$config = Config::getInstance();
$cmd = escapeshellcmd(
$config->python.' '.escapeshellarg($config->youtubedl).
' '.$config->params
$this->config->python.' '.escapeshellarg($this->config->youtubedl).
' '.$this->config->params
);
if (isset($format)) {
$cmd .= ' -f '.escapeshellarg($format);