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

Experimental support for M3U streams

Browse source
This commit is contained in:
Pierre Rudloff 2016-12-26 15:50:26 +01:00
parent 1a6e995262
commit 28a8addbf1
5 changed files with 56 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
controllers/FrontController.php
View file

@ -153,7 +153,7 @@ class FrontController
}
if (isset($params['audio'])) {
try {
return $this->getStream($params['url'], 'mp3[protocol^=http]', $response, $request, $password);
return $this->getStream($params['url'], 'mp3', $response, $request, $password);
} catch (PasswordException $e) {
return $this->password($request, $response);
} catch (\Exception $e) {
@ -223,14 +223,22 @@ class FrontController
$format = 'best';
}
$video = $this->download->getJSON($url, $format, $password);
$client = new \GuzzleHttp\Client();
$stream = $client->request('GET', $video->url, ['stream' => true]);
$response = $response->withHeader('Content-Disposition', 'attachment; filename="'.$video->_filename.'"');
$response = $response->withHeader('Content-Type', $stream->getHeader('Content-Type'));
$response = $response->withHeader('Content-Length', $stream->getHeader('Content-Length'));
if ($request->isGet()) {
$response = $response->withBody($stream->getBody());
if ($video->protocol == 'm3u8') {
$stream = $this->download->getM3uStream($video);
$response = $response->withHeader('Content-Type', 'video/'.$video->ext);
if ($request->isGet()) {
$response = $response->withBody(new Stream($stream));
}
} else {
$client = new \GuzzleHttp\Client();
$stream = $client->request('GET', $video->url, ['stream' => true]);
$response = $response->withHeader('Content-Type', $stream->getHeader('Content-Type'));
$response = $response->withHeader('Content-Length', $stream->getHeader('Content-Length'));
if ($request->isGet()) {
$response = $response->withBody($stream->getBody());
}
}
$response = $response->withHeader('Content-Disposition', 'attachment; filename="'.$video->_filename.'"');
return $response;
}