Display error when trying to convert a M3U8 file (fixes #83)
This commit is contained in:
parent
0ba030a981
commit
5aad3abc5d
2 changed files with 14 additions and 0 deletions
|
@ -265,6 +265,9 @@ class VideoDownload
|
||||||
}
|
}
|
||||||
|
|
||||||
$video = $this->getJSON($url, $format, $password);
|
$video = $this->getJSON($url, $format, $password);
|
||||||
|
if (in_array($video->protocol, ['m3u8', 'm3u8_native'])) {
|
||||||
|
throw(new \Exception('Conversion of M3U8 files is not supported.'));
|
||||||
|
}
|
||||||
|
|
||||||
//Vimeo needs a correct user-agent
|
//Vimeo needs a correct user-agent
|
||||||
ini_set(
|
ini_set(
|
||||||
|
|
|
@ -323,4 +323,15 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
|
||||||
$config->rtmpdump = 'foobar';
|
$config->rtmpdump = 'foobar';
|
||||||
$this->download->getAudioStream($url, $format);
|
$this->download->getAudioStream($url, $format);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test getAudioStream function with a M3U8 file.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
* @expectedException Exception
|
||||||
|
*/
|
||||||
|
public function testGetAudioStreamM3uError()
|
||||||
|
{
|
||||||
|
$this->download->getAudioStream('https://twitter.com/verge/status/813055465324056576/video/1', 'best');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue