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

fixup! refactor: New Video class

Browse source
This commit is contained in:
Pierre Rudloff 2019-04-21 18:35:24 +02:00
parent 4c9af8ad1d
commit 06a631c892
14 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/Config.php
View file

@ -141,9 +141,10 @@ class Config
/**
* Throw an exception if some of the options are invalid.
*
* @return void
* @throws Exception If youtube-dl is missing
* @throws Exception If Python is missing
*
* @return void
*/
private function validateOptions()
{
@ -223,8 +224,8 @@ class Config
/**
* Manually set some options.
*
* @param array $options Options (see `config/config.example.yml` for available options)
* @param boolean $update True to update an existing instance
* @param array $options Options (see `config/config.example.yml` for available options)
* @param bool $update True to update an existing instance
*/
public static function setOptions(array $options, $update = true)
{

3
classes/PlaylistArchiveStream.php
View file

@ -8,8 +8,6 @@ namespace Alltube;
use Barracuda\ArchiveStream\TarArchive;
use GuzzleHttp\Psr7\Stream;
use Psr\Http\Message\StreamInterface;
use RuntimeException;
use stdClass;
/**
* Class used to create a Tar archive from playlists and stream it to the browser.
@ -41,6 +39,7 @@ class PlaylistArchiveStream extends TarArchive implements StreamInterface
/**
* True if the archive is complete.
*
* @var bool
*/
private $isComplete = false;

30
classes/Video.php
View file

@ -26,19 +26,22 @@ class Video
private $config;
/**
* URL of the page containing the video
* URL of the page containing the video.
*
* @var string
*/
private $webpageUrl;
/**
* Requested video format
* Requested video format.
*
* @var string
*/
private $requestedFormat;
/**
* Password
* Password.
*
* @var string
*/
private $password;
@ -68,6 +71,7 @@ class Video
private function getProcess(array $arguments)
{
$config = Config::getInstance();
return new Process(
array_merge(
[$config->python, $config->youtubedl],
@ -90,7 +94,7 @@ class Video
/**
* Get a property from youtube-dl.
*
* @param string $prop Property
* @param string $prop Property
*
* @throws PasswordException If the video is protected by a password and no password was specified
* @throws Exception If the password is wrong
@ -172,7 +176,7 @@ class Video
*
* @param string $name Property
*
* @return boolean
* @return bool
*/
public function __isset($name)
{
@ -281,11 +285,11 @@ class Video
/**
* Get a process that runs avconv in order to convert a video.
*
* @param int $audioBitrate Audio bitrate of the converted file
* @param string $filetype Filetype of the converted file
* @param bool $audioOnly True to return an audio-only file
* @param string $from Start the conversion at this time
* @param string $to End the conversion at this time
* @param int $audioBitrate Audio bitrate of the converted file
* @param string $filetype Filetype of the converted file
* @param bool $audioOnly True to return an audio-only file
* @param string $from Start the conversion at this time
* @param string $to End the conversion at this time
*
* @throws Exception If avconv/ffmpeg is missing
*
@ -353,8 +357,8 @@ class Video
/**
* Get audio stream of converted video.
*
* @param string $from Start the conversion at this time
* @param string $to End the conversion at this time
* @param string $from Start the conversion at this time
* @param string $to End the conversion at this time
*
* @throws Exception If your try to convert an M3U8 video
* @throws Exception If the popen stream was not created correctly
@ -526,7 +530,7 @@ class Video
*/
public function withFormat($format)
{
return new Video($this->webpageUrl, $format, $this->password);
return new self($this->webpageUrl, $format, $this->password);
}
/**