Skip to content
Permalink
Browse files
Smal fixes with playlists
  • Loading branch information
Rudloff committed Apr 25, 2017
1 parent 554dd14 commit 7428b334de7a9b114bdf425cfcdea5123f683fae
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 6 deletions.
@@ -227,14 +227,21 @@ private function getVideoResponse(Request $request, Response $response, array $p
} else {
$template = 'video.tpl';
}
if (isset($video->title)) {
$title = $video->title;
$description = 'Download "'.$video->title.'" from '.$video->extractor_key;
} else {
$title = 'Video download';
$description = 'Download video from '.$video->extractor_key;
}
$this->view->render(
$response,
$template,
[
'video' => $video,
'class' => 'video',
'title' => $video->title,
'description' => 'Download "'.$video->title.'" from '.$video->extractor_key,
'title' => $title,
'description' => $description,
'protocol' => $protocol,
'config' => $this->config,
'canonical' => $this->getCanonicalUrl($request),
@@ -407,6 +407,7 @@ padding:3px;
clear: both;
padding-top: 2em;
text-align: left;
width: 600px;
}

.playlist-entry h3 {
@@ -682,6 +683,16 @@ h1 {
text-align:left;
}

.playlist-entry {
text-align: center;
width: auto;
}

.playlist-entry .thumb {
float: none;
margin-right: 0;
}

}

@media all and (display-mode: standalone) {
@@ -2,16 +2,18 @@
<div class="wrapper">
<div class="main">
{include file="inc/logo.tpl"}
<p>Videos extracted from the<i>
<p>Videos extracted from the {if isset($video->title)}<i>
<a href="{$video->webpage_url}">
{$video->title}</a></i> playlist:
{$video->title}</a></i>{/if} playlist:
</p>
{foreach $video->entries as $video}
<div class="playlist-entry">
<img class="thumb" src="{$video->thumbnail}" alt="" width="200" />
<h3><a href="{$video->webpage_url}">{$video->title}</a></h3>
<h3><a target="_blank" href="{$video->webpage_url}">{$video->title}</a></h3>
<a target="_blank" class="downloadBtn" href="{path_for name="redirect"}?url={$video->webpage_url}">Download</a>
<a target="_blank" href="{path_for name="video"}?url={$video->webpage_url}">More options</a>
{if count($video->formats) > 1}
<a target="_blank" href="{path_for name="video"}?url={$video->webpage_url}">More options</a>
{/if}
</div>
{/foreach}

@@ -179,6 +179,20 @@ public function testVideo()
$this->assertTrue($result->isOk());
}

/**
* Test the video() function with a video that does not have a title.
*
* @return void
*/
public function testVideoWithoutTitle()
{
$result = $this->controller->video(
$this->request->withQueryParams(['url'=>'http://html5demos.com/video']),
$this->response
);
$this->assertTrue($result->isOk());
}

/**
* Test the video() function with audio conversion.
*

0 comments on commit 7428b33

Please sign in to comment.