parent
9313bc2230
commit
b91fe78dcd
3 changed files with 8 additions and 2 deletions
|
@ -240,7 +240,7 @@ class DownloadController extends BaseController
|
|||
}
|
||||
if (count($videoUrls) > 1) {
|
||||
return $this->getRemuxStream($request, $response);
|
||||
} elseif ($this->config->stream) {
|
||||
} elseif ($this->config->stream && (isset($this->video->entries) || $request->getQueryParam('stream'))) {
|
||||
return $this->getStream($request, $response);
|
||||
} else {
|
||||
if (empty($videoUrls[0])) {
|
||||
|
|
|
@ -80,6 +80,11 @@
|
|||
{/foreach}
|
||||
</optgroup>
|
||||
</select><br/><br/>
|
||||
{if $config->stream}
|
||||
<input type="checkbox" name="stream" id="stream"/>
|
||||
<label for="stream">{t}Stream the video through the server{/t}</label>
|
||||
<br/><br/>
|
||||
{/if}
|
||||
{if $config->convertAdvanced}
|
||||
<input type="checkbox" name="customConvert" id="customConvert"/>
|
||||
<label for="customConvert">{t}Convert into a custom format:{/t}</label>
|
||||
|
|
|
@ -67,7 +67,7 @@ class DownloadControllerTest extends ControllerTest
|
|||
|
||||
$this->assertRequestIsOk(
|
||||
'download',
|
||||
['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU']
|
||||
['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'stream' => true]
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -89,6 +89,7 @@ class DownloadControllerTest extends ControllerTest
|
|||
[
|
||||
'url' => 'https://twitter.com/verge/status/813055465324056576/video/1',
|
||||
'format' => 'hls-2176',
|
||||
'stream' => true,
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue