refactor: Cleanup best format logic
Reuse $defaultFormat everywhere instead of duplicating conditions
This commit is contained in:
parent
506584ceee
commit
f315343798
2 changed files with 11 additions and 12 deletions
|
@ -97,9 +97,7 @@ class FrontController
|
|||
$session_factory = new SessionFactory();
|
||||
$session = $session_factory->newInstance($cookies);
|
||||
$this->sessionSegment = $session->getSegment(self::class);
|
||||
if ($this->config->remux) {
|
||||
$this->defaultFormat = 'bestvideo+bestaudio,best';
|
||||
} elseif ($this->config->stream) {
|
||||
if ($this->config->stream) {
|
||||
$this->defaultFormat = 'best';
|
||||
}
|
||||
}
|
||||
|
@ -316,13 +314,14 @@ class FrontController
|
|||
$response,
|
||||
$template,
|
||||
[
|
||||
'video' => $video,
|
||||
'class' => 'video',
|
||||
'title' => $title,
|
||||
'description' => $description,
|
||||
'config' => $this->config,
|
||||
'canonical' => $this->getCanonicalUrl($request),
|
||||
'locale' => $this->localeManager->getLocale(),
|
||||
'video' => $video,
|
||||
'class' => 'video',
|
||||
'title' => $title,
|
||||
'description' => $description,
|
||||
'config' => $this->config,
|
||||
'canonical' => $this->getCanonicalUrl($request),
|
||||
'locale' => $this->localeManager->getLocale(),
|
||||
'defaultFormat' => $this->defaultFormat,
|
||||
]
|
||||
);
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
{/if}
|
||||
<select name="format" id="format" class="formats monospace">
|
||||
<optgroup label="{t}Generic formats{/t}">
|
||||
<option value="{if $config->stream}best{else}best[protocol=https]/best[protocol=http]{/if}">
|
||||
<option value="{$defaultFormat}">
|
||||
{strip}
|
||||
{t}Best{/t} ({$video->ext})
|
||||
{/strip}
|
||||
|
@ -37,7 +37,7 @@
|
|||
{t}Remux best video with best audio{/t}
|
||||
</option>
|
||||
{/if}
|
||||
<option value="{if $config->stream}worst{else}worst[protocol=https]/worst[protocol=http]{/if}">
|
||||
<option value="{$defaultFormat|replace:best:worst}">
|
||||
{t}Worst{/t}
|
||||
</option>
|
||||
</optgroup>
|
||||
|
|
Loading…
Reference in a new issue