servers
/
alltube
mirror of https://github.com/Rudloff/alltube.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'feature/travis' into develop

This commit is contained in:
Pierre Rudloff 2019-04-20 12:28:48 +02:00
parent 9949a0d32b ff95b93c20
commit 5cb8bc30b3
12 changed files with 631 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.appveyor.yml
View File

@ -2,16 +2,17 @@
install:
- sc config wuauserv start= auto
- net start wuauserv
- cinst php composer ffmpeg phantomjs
- cinst php --version 7.1.28
- cinst composer ffmpeg phantomjs
- refreshenv
- copy C:\tools\php72\php.ini-development C:\tools\php72\php.ini
- echo extension=C:\tools\php72\ext\php_gmp.dll >> C:\tools\php72\php.ini
- echo extension=C:\tools\php72\ext\php_gettext.dll >> C:\tools\php72\php.ini
- echo extension=C:\tools\php72\ext\php_intl.dll >> C:\tools\php72\php.ini
- echo extension=C:\tools\php72\ext\php_openssl.dll >> C:\tools\php72\php.ini
- echo extension=C:\tools\php72\ext\php_mbstring.dll >> C:\tools\php72\php.ini
- copy C:\tools\php71\php.ini-development C:\tools\php71\php.ini
- echo extension=C:\tools\php71\ext\php_gmp.dll >> C:\tools\php71\php.ini
- echo extension=C:\tools\php71\ext\php_gettext.dll >> C:\tools\php71\php.ini
- echo extension=C:\tools\php71\ext\php_intl.dll >> C:\tools\php71\php.ini
- echo extension=C:\tools\php71\ext\php_openssl.dll >> C:\tools\php71\php.ini
- echo extension=C:\tools\php71\ext\php_mbstring.dll >> C:\tools\php71\php.ini
- composer install --no-dev
- composer global require phpunit/phpunit
- composer global require phpunit/phpunit:^6.0
- C:\Python36\python.exe -m pip install youtube-dl
test_script:

3
Gruntfile.js
View File

@ -36,7 +36,8 @@ module.exports = function (grunt) {
phpstan: {
options: {
level: 'max',
bin: 'vendor/bin/phpstan'
bin: 'vendor/bin/phpstan',
config: 'phpstan.neon'
},
php: {
src: ['*.php', 'classes/*.php', 'controllers/*.php']

17
classes/PlaylistArchiveStream.php
View File

@ -66,8 +66,6 @@ class PlaylistArchiveStream extends TarArchive
*/
public function __construct(Config $config = null)
{
parent::__construct();
$this->client = new Client();
$this->download = new VideoDownload($config);
}
@ -82,8 +80,11 @@ class PlaylistArchiveStream extends TarArchive
protected function send($data)
{
$pos = ftell($this->buffer);
// Add data to the buffer.
fwrite($this->buffer, $data);
if ($pos !== false) {
// Rewind so that stream_read() can later read this data.
fseek($this->buffer, $pos);
}
}
@ -208,4 +209,16 @@ class PlaylistArchiveStream extends TarArchive
return fread($this->buffer, $count);
}
/**
* Called when fclose() is used on the stream.
*
* @return void
*/
public function stream_close()
{
if (is_resource($this->buffer)) {
fclose($this->buffer);
}
}
}

11
css/style.css
View File

@ -722,14 +722,3 @@ h1 {
white-space: nowrap;
width: 1px;
}
.sr-only.focusable:active,
.sr-only.focusable:focus {
clip: auto;
height: auto;
margin: 0;
overflow: visible;
position: static;
white-space: normal;
width: auto;
}

2
package.json
View File

@ -21,7 +21,7 @@
"grunt-markdownlint": "~2.1.0",
"grunt-phpcs": "~0.4.0",
"grunt-phpdocumentor": "~0.4.1",
"grunt-phpstan": "~0.1.0",
"grunt-phpstan": "~0.2.0",
"grunt-phpunit": "~0.3.6"
},
"homepage": "https://www.alltubedownload.net/",

4
phpstan.neon Normal file
View File

@ -0,0 +1,4 @@
parameters:
ignoreErrors:
# The Archive constructor messes up the output buffering.
- '#Alltube\\PlaylistArchiveStream::__construct\(\) does not call parent constructor from Barracuda\\ArchiveStream\\TarArchive\.#'

15
tests/FrontControllerTest.php
View File

@ -292,6 +292,9 @@ class FrontControllerTest extends TestCase
*/
public function testVideoWithVimeoAudio()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
// So we can test the fallback to default format
$this->assertRequestIsOk('video', ['url' => 'https://vimeo.com/251997032', 'audio' => true]);
}
@ -319,6 +322,9 @@ class FrontControllerTest extends TestCase
*/
public function testVideoWithPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$result = $this->controller->video(
$this->request->withQueryParams(['url' => 'http://vimeo.com/68375962'])
->withParsedBody(['password' => 'youtube-dl']),
@ -334,6 +340,9 @@ class FrontControllerTest extends TestCase
*/
public function testVideoWithMissingPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$this->assertRequestIsOk('video', ['url' => 'http://vimeo.com/68375962']);
$this->assertRequestIsOk('video', ['url' => 'http://vimeo.com/68375962', 'audio' => true]);
}
@ -433,6 +442,9 @@ class FrontControllerTest extends TestCase
*/
public function testRedirectWithM3uStream()
{
if (getenv('CI')) {
$this->markTestSkipped('Twitter returns a 429 error when the test is ran too many times.');
}
$this->config->stream = true;
$this->assertRequestIsOk(
'redirect',
@ -502,6 +514,9 @@ class FrontControllerTest extends TestCase
*/
public function testRedirectWithMissingPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$this->assertRequestIsRedirect('redirect', ['url' => 'http://vimeo.com/68375962']);
}

9
tests/LocaleManagerTest.php
View File

@ -26,19 +26,18 @@ class LocaleManagerTest extends TestCase
*/
protected function setUp()
{
$this->localeManager = new LocaleManager();
$_SESSION[LocaleManager::class]['locale'] = 'foo_BAR';
$this->localeManager = new LocaleManager();
}
/**
* Test the getSupportedLocales function.
* Unset locale after each test.
*
* @return void
*/
public function testConstructorWithCookies()
protected function tearDown()
{
$localeManager = new LocaleManager([]);
$this->assertEquals('foo_BAR', (string) $localeManager->getLocale());
$this->localeManager->unsetLocale();
}
/**

10
tests/LocaleTest.php
View File

@ -77,4 +77,14 @@ class LocaleTest extends TestCase
{
$this->assertEquals('fr', $this->localeObject->getIso3166());
}
/**
* Test the getCountry function.
*
* @return void
*/
public function testGetCountry()
{
$this->assertEquals(country('fr'), $this->localeObject->getCountry());
}
}

10
tests/PlaylistArchiveStreamTest.php
View File

@ -34,6 +34,16 @@ class PlaylistArchiveStreamTest extends TestCase
$this->stream = new PlaylistArchiveStream(Config::getInstance('config/'.$configFile));
}
/**
* Clean variables used in tests.
*
* @return void
*/
protected function tearDown()
{
$this->stream->stream_close();
}
/**
* Test the stream_open() function.
*

42
tests/VideoDownloadTest.php
View File

@ -117,6 +117,9 @@ class VideoDownloadTest extends TestCase
*/
public function testGetURLWithPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$videoURL = $this->download->getURL('http://vimeo.com/68375962', null, 'youtube-dl');
$this->assertContains('vimeocdn.com', $videoURL[0]);
}
@ -129,6 +132,9 @@ class VideoDownloadTest extends TestCase
*/
public function testGetURLWithMissingPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$this->download->getURL('http://vimeo.com/68375962');
}
@ -140,6 +146,9 @@ class VideoDownloadTest extends TestCase
*/
public function testGetURLWithWrongPassword()
{
if (getenv('CI')) {
$this->markTestSkipped('Travis is blacklisted by Vimeo.');
}
$this->download->getURL('http://vimeo.com/68375962', null, 'foo');
}
@ -164,7 +173,7 @@ class VideoDownloadTest extends TestCase
*/
public function urlProvider()
{
return [
$videos = [
[
'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'best[protocol^=http]',
'It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU',
@ -178,12 +187,6 @@ class VideoDownloadTest extends TestCase
'mp4',
'googlevideo.com',
],
[
'https://vimeo.com/24195442', 'best[protocol^=http]',
'Carving_the_Mountains-24195442',
'mp4',
'vimeocdn.com',
],
[
'http://www.bbc.co.uk/programmes/b039g8p7', 'bestaudio/best',
'Kaleidoscope_Leonard_Cohen-b039d07m',
@ -203,6 +206,18 @@ class VideoDownloadTest extends TestCase
'openload.co',
],
];
if (!getenv('CI')) {
// Travis is blacklisted by Vimeo.
$videos[] = [
'https://vimeo.com/24195442', 'best[protocol^=http]',
'Carving_the_Mountains-24195442',
'mp4',
'vimeocdn.com',
];
}
return $videos;
}
/**
@ -229,14 +244,19 @@ class VideoDownloadTest extends TestCase
*/
public function m3uUrlProvider()
{
return [
[
$videos = [];
if (!getenv('CI')) {
// Twitter returns a 429 error when the test is ran too many times.
$videos[] = [
'https://twitter.com/verge/status/813055465324056576/video/1', 'hls-2176',
'The_Verge_-_This_tiny_origami_robot_can_self-fold_and_complete_tasks-813055465324056576',
'mp4',
'video.twimg.com',
],
];
];
}
return $videos;
}
/**

728
yarn.lock
View File

File diff suppressed because it is too large Load Diff