PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/stream

Browse source
This commit is contained in:
Pierre Rudloff 2016-12-27 00:02:27 +01:00
commit f27bb3bbb9
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
classes/VideoDownload.php
View file

@ -265,6 +265,9 @@ class VideoDownload
}
$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
ini_set(

11
tests/VideoDownloadTest.php
View file

@ -330,4 +330,15 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase
$config->rtmpdump = 'foobar';
$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');
}
}