mirror of
https://github.com/BookStackApp/BookStack.git
synced 2026-02-05 16:49:47 +03:00
Compare commits
6 Commits
v21.08.1
...
fix/video-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc275c0b53 | ||
|
|
8a2c13729e | ||
|
|
5f113f3f52 | ||
|
|
27954d6bc6 | ||
|
|
5bee25d651 | ||
|
|
0d1db98289 |
@@ -2,9 +2,14 @@
|
||||
|
||||
use BookStack\Entities\Repos\EntityRepo;
|
||||
use BookStack\Uploads\ImageService;
|
||||
use BookStack\Exceptions\ExportException;
|
||||
|
||||
class ExportService
|
||||
{
|
||||
protected $contentMatching = [
|
||||
'video' => ["www.youtube.com", "player.vimeo.com", "www.dailymotion.com"],
|
||||
'map' => ['maps.google.com']
|
||||
];
|
||||
|
||||
protected $entityRepo;
|
||||
protected $imageService;
|
||||
@@ -74,16 +79,17 @@ class ExportService
|
||||
/**
|
||||
* Convert a page to a PDF file.
|
||||
* @param Page $page
|
||||
* @param bool $isTesting
|
||||
* @return mixed|string
|
||||
* @throws \Throwable
|
||||
*/
|
||||
public function pageToPdf(Page $page)
|
||||
public function pageToPdf(Page $page, bool $isTesting = false)
|
||||
{
|
||||
$this->entityRepo->renderPage($page);
|
||||
$html = view('pages/pdf', [
|
||||
'page' => $page
|
||||
])->render();
|
||||
return $this->htmlToPdf($html);
|
||||
return $this->htmlToPdf($html, $isTesting);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -124,12 +130,16 @@ class ExportService
|
||||
/**
|
||||
* Convert normal webpage HTML to a PDF.
|
||||
* @param $html
|
||||
* @param $isTesting
|
||||
* @return string
|
||||
* @throws \Exception
|
||||
*/
|
||||
protected function htmlToPdf($html)
|
||||
protected function htmlToPdf($html, $isTesting = false)
|
||||
{
|
||||
$containedHtml = $this->containHtml($html);
|
||||
$containedHtml = $this->containHtml($html, true);
|
||||
if ($isTesting) {
|
||||
return $containedHtml;
|
||||
}
|
||||
$useWKHTML = config('snappy.pdf.binary') !== false;
|
||||
if ($useWKHTML) {
|
||||
$pdf = \SnappyPDF::loadHTML($containedHtml);
|
||||
@@ -143,46 +153,64 @@ class ExportService
|
||||
/**
|
||||
* Bundle of the contents of a html file to be self-contained.
|
||||
* @param $htmlContent
|
||||
* @param bool $isPDF
|
||||
* @return mixed|string
|
||||
* @throws \Exception
|
||||
* @throws \BookStack\Exceptions\ExportException
|
||||
*/
|
||||
protected function containHtml($htmlContent)
|
||||
protected function containHtml(string $htmlContent, bool $isPDF = false) : string
|
||||
{
|
||||
$imageTagsOutput = [];
|
||||
preg_match_all("/\<img.*src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
|
||||
$dom = $this->getDOM($htmlContent);
|
||||
if ($dom === false) {
|
||||
throw new ExportException(trans('errors.dom_parse_error'));
|
||||
}
|
||||
|
||||
// Replace image src with base64 encoded image strings
|
||||
if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
|
||||
foreach ($imageTagsOutput[0] as $index => $imgMatch) {
|
||||
$oldImgTagString = $imgMatch;
|
||||
$srcString = $imageTagsOutput[2][$index];
|
||||
$imageEncoded = $this->imageService->imageUriToBase64($srcString);
|
||||
if ($imageEncoded === null) {
|
||||
$imageEncoded = $srcString;
|
||||
}
|
||||
$newImgTagString = str_replace($srcString, $imageEncoded, $oldImgTagString);
|
||||
$htmlContent = str_replace($oldImgTagString, $newImgTagString, $htmlContent);
|
||||
// replace image src with base64 encoded image strings
|
||||
$images = $dom->getElementsByTagName('img');
|
||||
foreach ($images as $img) {
|
||||
$base64String = $this->imageService->imageUriToBase64($img->getAttribute('src'));
|
||||
if ($base64String !== null) {
|
||||
$img->setAttribute('src', $base64String);
|
||||
$dom->saveHTML($img);
|
||||
}
|
||||
}
|
||||
|
||||
$linksOutput = [];
|
||||
preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $linksOutput);
|
||||
|
||||
// Replace image src with base64 encoded image strings
|
||||
if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
|
||||
foreach ($linksOutput[0] as $index => $linkMatch) {
|
||||
$oldLinkString = $linkMatch;
|
||||
$srcString = $linksOutput[2][$index];
|
||||
if (strpos(trim($srcString), 'http') !== 0) {
|
||||
$newSrcString = url($srcString);
|
||||
$newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
|
||||
$htmlContent = str_replace($oldLinkString, $newLinkString, $htmlContent);
|
||||
}
|
||||
// replace all relative hrefs.
|
||||
$links = $dom->getElementsByTagName('a');
|
||||
foreach ($links as $link) {
|
||||
$href = $link->getAttribute('href');
|
||||
if (strpos(trim($href), 'http') !== 0) {
|
||||
$newHref = url($href);
|
||||
$link->setAttribute('href', $newHref);
|
||||
$dom->saveHTML($link);
|
||||
}
|
||||
}
|
||||
|
||||
// Replace any relative links with system domain
|
||||
return $htmlContent;
|
||||
// replace all src in video, audio and iframe tags
|
||||
$xmlDoc = new \DOMXPath($dom);
|
||||
$srcElements = $xmlDoc->query('//video | //audio | //iframe');
|
||||
foreach ($srcElements as $element) {
|
||||
$element = $this->fixRelativeSrc($element);
|
||||
$dom->saveHTML($element);
|
||||
|
||||
if ($isPDF) {
|
||||
$src = $element->getAttribute('src');
|
||||
$label = $this->getContentLabel($src);
|
||||
|
||||
$div = $dom->createElement('div');
|
||||
$textNode = $dom->createTextNode($label);
|
||||
|
||||
$anchor = $dom->createElement('a');
|
||||
$anchor->setAttribute('href', $src);
|
||||
$anchor->textContent = $src;
|
||||
|
||||
$div->appendChild($textNode);
|
||||
$div->appendChild($anchor);
|
||||
|
||||
$element->parentNode->replaceChild($div, $element);
|
||||
}
|
||||
}
|
||||
|
||||
return $dom->saveHTML();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,11 +218,43 @@ class ExportService
|
||||
* This method filters any bad looking content to provide a nice final output.
|
||||
* @param Page $page
|
||||
* @return mixed
|
||||
* @throws \BookStack\Exceptions\ExportException
|
||||
*/
|
||||
public function pageToPlainText(Page $page)
|
||||
{
|
||||
$html = $this->entityRepo->renderPage($page);
|
||||
$text = strip_tags($html);
|
||||
$dom = $this->getDom($html);
|
||||
|
||||
if ($dom === false) {
|
||||
throw new ExportException(trans('errors.dom_parse_error'));
|
||||
}
|
||||
|
||||
// handle anchor tags.
|
||||
$links = $dom->getElementsByTagName('a');
|
||||
foreach ($links as $link) {
|
||||
$href = $link->getAttribute('href');
|
||||
if (strpos(trim($href), 'http') !== 0) {
|
||||
$newHref = url($href);
|
||||
$link->setAttribute('href', $newHref);
|
||||
}
|
||||
|
||||
$link->textContent = trim($link->textContent . " ($href)");
|
||||
$dom->saveHTML();
|
||||
}
|
||||
|
||||
$xmlDoc = new \DOMXPath($dom);
|
||||
$srcElements = $xmlDoc->query('//video | //audio | //iframe | //img');
|
||||
foreach ($srcElements as $element) {
|
||||
$element = $this->fixRelativeSrc($element);
|
||||
$fixedSrc = $element->getAttribute('src');
|
||||
$label = $this->getContentLabel($fixedSrc);
|
||||
$finalLabel = "\n\n$label $fixedSrc\n\n";
|
||||
|
||||
$textNode = $dom->createTextNode($finalLabel);
|
||||
$element->parentNode->replaceChild($textNode, $element);
|
||||
}
|
||||
|
||||
$text = strip_tags($dom->saveHTML());
|
||||
// Replace multiple spaces with single spaces
|
||||
$text = preg_replace('/\ {2,}/', ' ', $text);
|
||||
// Reduce multiple horrid whitespace characters.
|
||||
@@ -238,4 +298,37 @@ class ExportService
|
||||
}
|
||||
return $text;
|
||||
}
|
||||
|
||||
protected function getDom(string $htmlContent) : \DOMDocument
|
||||
{
|
||||
// See - https://stackoverflow.com/a/17559716/903324
|
||||
$dom = new \DOMDocument();
|
||||
libxml_use_internal_errors(true);
|
||||
$dom->loadHTML($htmlContent);
|
||||
libxml_clear_errors();
|
||||
return $dom;
|
||||
}
|
||||
|
||||
protected function fixRelativeSrc(\DOMElement $element): \DOMElement
|
||||
{
|
||||
$src = $element->getAttribute('src');
|
||||
if (strpos(trim($src), 'http') !== 0) {
|
||||
$newSrc = 'https:' . $src;
|
||||
$element->setAttribute('src', $newSrc);
|
||||
}
|
||||
return $element;
|
||||
}
|
||||
|
||||
|
||||
protected function getContentLabel(string $src) : string
|
||||
{
|
||||
foreach ($this->contentMatching as $key => $possibleValues) {
|
||||
foreach ($possibleValues as $value) {
|
||||
if (strpos($src, $value)) {
|
||||
return trans("entities.$key");
|
||||
}
|
||||
}
|
||||
}
|
||||
return trans('entities.embedded_content');
|
||||
}
|
||||
}
|
||||
|
||||
6
app/Exceptions/ExportException.php
Normal file
6
app/Exceptions/ExportException.php
Normal file
@@ -0,0 +1,6 @@
|
||||
<?php namespace BookStack\Exceptions;
|
||||
|
||||
class ExportException extends PrettyException
|
||||
{
|
||||
|
||||
}
|
||||
@@ -495,13 +495,15 @@ class PageController extends Controller
|
||||
* https://github.com/barryvdh/laravel-dompdf
|
||||
* @param string $bookSlug
|
||||
* @param string $pageSlug
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function exportPdf($bookSlug, $pageSlug)
|
||||
public function exportPdf($bookSlug, $pageSlug, Request $request)
|
||||
{
|
||||
$isTesting = $request->query('isTesting');
|
||||
$page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
|
||||
$page->html = $this->pageRepo->renderPage($page);
|
||||
$pdfContent = $this->exportService->pageToPdf($page);
|
||||
$pdfContent = $this->exportService->pageToPdf($page, !empty($isTesting));
|
||||
return $this->downloadResponse($pdfContent, $pageSlug . '.pdf');
|
||||
}
|
||||
|
||||
|
||||
@@ -289,5 +289,11 @@ return [
|
||||
// Revision
|
||||
'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
|
||||
'revision_delete_success' => 'Revision deleted',
|
||||
'revision_cannot_delete_latest' => 'Cannot delete the latest revision.'
|
||||
'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
|
||||
|
||||
// PDF / Text Embeds
|
||||
'video' => 'Video: ',
|
||||
'map' => 'Map: ',
|
||||
'embedded_content' => 'Embedded Content: '
|
||||
|
||||
];
|
||||
@@ -81,4 +81,7 @@ return [
|
||||
'app_down' => ':appName is down right now',
|
||||
'back_soon' => 'It will be back up soon.',
|
||||
|
||||
// Export errors
|
||||
'dom_parse_error' => 'There was an error while exporting the page. This maybe caused due to the HTML structure of the page.'
|
||||
|
||||
];
|
||||
|
||||
@@ -134,4 +134,52 @@ class ExportTest extends TestCase
|
||||
$resp->assertDontSee($page->updated_at->diffForHumans());
|
||||
}
|
||||
|
||||
public function test_html_export_media_protocol_updated()
|
||||
{
|
||||
$page = Page::first();
|
||||
$page->html = '<p id="bkmrk-%C2%A0-0"> </p><p id="bkmrk-%C2%A0-1"><iframe src="//www.youtube.com/embed/LkFt_fp7FmE" width="560" height="314" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk-"><iframe src="//player.vimeo.com/video/276396369?title=0&amp;byline=0" width="425" height="350" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk--0"><iframe style="border: 0;" src="//maps.google.com/embed?testquery=true" width="600" height="450" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk--1"><iframe src="//www.dailymotion.com/embed/video/x2rqgfm" width="480" height="432" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk-%C2%A0-2"> </p>';
|
||||
$page->save();
|
||||
|
||||
$this->asEditor();
|
||||
$resp = $this->get($page->getUrl('/export/html'));
|
||||
$resp->assertStatus(200);
|
||||
|
||||
$checks = [
|
||||
'https://www.youtube.com/embed/LkFt_fp7FmE',
|
||||
'https://player.vimeo.com/video/276396369?title=0&amp;byline=0',
|
||||
'https://maps.google.com/embed?testquery=true',
|
||||
'https://www.dailymotion.com/embed/video/x2rqgfm',
|
||||
];
|
||||
|
||||
foreach ($checks as $check) {
|
||||
$resp->assertSee($check);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function test_pdf_export_no_video_iframe() {
|
||||
$page = Page::first();
|
||||
$page->html = '<p id="bkmrk-%C2%A0-0"> </p>' .
|
||||
'<p id="bkmrk-%C2%A0-1"><iframe src="//www.youtube.com/embed/LkFt_fp7FmE" width="560" height="314" allowfullscreen="allowfullscreen"></iframe></p>' .
|
||||
'<p id="bkmrk-"><video src="//player.vimeo.com/video/276396369?title=0&amp;byline=0" width="425" height="350" allowfullscreen="allowfullscreen"></video></p>' .
|
||||
'<p id="bkmrk--0"><iframe style="border: 0;" src="//maps.google.com/embed?testquery=true" width="600" height="450" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p>' .
|
||||
'<p id="bkmrk--1"><iframe src="//www.dailymotion.com/embed/video/x2rqgfm" width="480" height="432" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p>' .
|
||||
'<p id="bkmrk-%C2%A0-2"> </p>';
|
||||
|
||||
$page->save();
|
||||
|
||||
$this->asEditor();
|
||||
$resp = $this->get($page->getUrl('/export/pdf?isTesting=true'));
|
||||
$resp->assertStatus(200);
|
||||
|
||||
$checks = [
|
||||
'</video>',
|
||||
'</iframe>'
|
||||
];
|
||||
|
||||
foreach ($checks as $check) {
|
||||
$resp->assertDontSee($check);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user