X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FEntriesExport.php;h=f43bc33d89106a2269da73a4c4716fa7ba82fee1;hb=dc7fa8dfc606a03295a58d797f269f3ed7097939;hp=3d36a4c89e40c91c3ae635c5c8aad1d5641ea835;hpb=64f1d8f77a75332b731124c5ebab4bed7a512081;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 3d36a4c8..f43bc33d 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -2,12 +2,14 @@
namespace Wallabag\CoreBundle\Helper;
-use JMS\Serializer;
+use Html2Text\Html2Text;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerBuilder;
use PHPePub\Core\EPub;
use PHPePub\Core\Structure\OPF\DublinCore;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Translation\TranslatorInterface;
+use Wallabag\CoreBundle\Entity\Entry;
/**
* This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
@@ -16,21 +18,19 @@ class EntriesExport
{
private $wallabagUrl;
private $logoPath;
+ private $translator;
private $title = '';
private $entries = [];
- private $authors = ['wallabag'];
+ private $author = 'wallabag';
private $language = '';
- private $footerTemplate = '
-
Produced by wallabag with %EXPORT_METHOD%
-
Please open an issue if you have trouble with the display of this E-Book on your device.
-
';
/**
* @param string $wallabagUrl Wallabag instance url
* @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE
*/
- public function __construct($wallabagUrl, $logoPath)
+ public function __construct(TranslatorInterface $translator, $wallabagUrl, $logoPath)
{
+ $this->translator = $translator;
$this->wallabagUrl = $wallabagUrl;
$this->logoPath = $logoPath;
}
@@ -63,7 +63,7 @@ class EntriesExport
*/
public function updateTitle($method)
{
- $this->title = $method.' articles';
+ $this->title = $method . ' articles';
if ('entry' === $method) {
$this->title = $this->entries[0]->getTitle();
@@ -72,6 +72,33 @@ class EntriesExport
return $this;
}
+ /**
+ * Sets the author for one entry or category.
+ *
+ * The publishers are used, or the domain name if empty.
+ *
+ * @param string $method Method to get articles
+ *
+ * @return EntriesExport
+ */
+ public function updateAuthor($method)
+ {
+ if ('entry' !== $method) {
+ $this->author = $method . ' authors';
+
+ return $this;
+ }
+
+ $this->author = $this->entries[0]->getDomainName();
+
+ $publishedBy = $this->entries[0]->getPublishedBy();
+ if (!empty($publishedBy)) {
+ $this->author = implode(', ', $publishedBy);
+ }
+
+ return $this;
+ }
+
/**
* Sets the output format.
*
@@ -81,7 +108,7 @@ class EntriesExport
*/
public function exportAs($format)
{
- $functionName = 'produce'.ucfirst($format);
+ $functionName = 'produce' . ucfirst($format);
if (method_exists($this, $functionName)) {
return $this->$functionName();
}
@@ -106,12 +133,12 @@ class EntriesExport
*/
$content_start =
"\n"
- ."\n"
- .''
- ."\n"
- ."wallabag articles book\n"
- ."\n"
- ."\n";
+ . "\n"
+ . ''
+ . "\n"
+ . "wallabag articles book\n"
+ . "\n"
+ . "\n";
$bookEnd = "\n\n";
@@ -128,9 +155,7 @@ class EntriesExport
$book->setLanguage($this->language);
$book->setDescription('Some articles saved on my wallabag');
- foreach ($this->authors as $author) {
- $book->setAuthor($author, $author);
- }
+ $book->setAuthor($this->author, $this->author);
// I hope this is a non existant address :)
$book->setPublisher('wallabag', 'wallabag');
@@ -164,11 +189,11 @@ class EntriesExport
// in filenames, we limit to A-z/0-9
$filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle());
- $chapter = $content_start.$entry->getContent().$bookEnd;
- $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
+ $chapter = $content_start . $entry->getContent() . $bookEnd;
+ $book->addChapter($entry->getTitle(), htmlspecialchars($filename) . '.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
}
- $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
+ $book->addChapter('Notices', 'Cover2.html', $content_start . $this->getExportInformation('PHPePub') . $bookEnd);
return Response::create(
$book->getBook(),
@@ -176,7 +201,7 @@ class EntriesExport
[
'Content-Description' => 'File Transfer',
'Content-type' => 'application/epub+zip',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.epub"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -196,7 +221,7 @@ class EntriesExport
* Book metadata
*/
$content->set('title', $this->title);
- $content->set('author', implode($this->authors));
+ $content->set('author', $this->author);
$content->set('subject', $this->title);
/*
@@ -228,7 +253,7 @@ class EntriesExport
'Accept-Ranges' => 'bytes',
'Content-Description' => 'File Transfer',
'Content-type' => 'application/x-mobipocket-ebook',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.mobi"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -247,7 +272,7 @@ class EntriesExport
* Book metadata
*/
$pdf->SetCreator(PDF_CREATOR);
- $pdf->SetAuthor('wallabag');
+ $pdf->SetAuthor($this->author);
$pdf->SetTitle($this->title);
$pdf->SetSubject('Articles via wallabag');
$pdf->SetKeywords('wallabag');
@@ -256,7 +281,7 @@ class EntriesExport
* Front page
*/
$pdf->AddPage();
- $intro = ''.$this->title.'
'.$this->getExportInformation('tcpdf');
+ $intro = '' . $this->title . '
' . $this->getExportInformation('tcpdf');
$pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
@@ -269,7 +294,7 @@ class EntriesExport
}
$pdf->AddPage();
- $html = ''.$entry->getTitle().'
';
+ $html = '' . $entry->getTitle() . '
';
$html .= $entry->getContent();
$pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
@@ -284,7 +309,7 @@ class EntriesExport
[
'Content-Description' => 'File Transfer',
'Content-type' => 'application/pdf',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.pdf"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -330,7 +355,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/csv',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.csv"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -348,7 +373,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/json',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.json"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -366,7 +391,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/xml',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.xml"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -382,8 +407,9 @@ class EntriesExport
$content = '';
$bar = str_repeat('=', 100);
foreach ($this->entries as $entry) {
- $content .= "\n\n".$bar."\n\n".$entry->getTitle()."\n\n".$bar."\n\n";
- $content .= trim(preg_replace('/\s+/S', ' ', strip_tags($entry->getContent())))."\n\n";
+ $content .= "\n\n" . $bar . "\n\n" . $entry->getTitle() . "\n\n" . $bar . "\n\n";
+ $html = new Html2Text($entry->getContent(), ['do_links' => 'none', 'width' => 100]);
+ $content .= $html->getText();
}
return Response::create(
@@ -391,7 +417,7 @@ class EntriesExport
200,
[
'Content-type' => 'text/plain',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.txt"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -402,7 +428,7 @@ class EntriesExport
*
* @param string $format
*
- * @return Serializer
+ * @return string
*/
private function prepareSerializingContent($format)
{
@@ -424,10 +450,12 @@ class EntriesExport
*/
private function getExportInformation($type)
{
- $info = str_replace('%EXPORT_METHOD%', $type, $this->footerTemplate);
+ $info = $this->translator->trans('export.footer_template', [
+ '%method%' => $type,
+ ]);
if ('tcpdf' === $type) {
- return str_replace('%IMAGE%', '', $info);
+ return str_replace('%IMAGE%', '', $info);
}
return str_replace('%IMAGE%', '', $info);