1 files changed, 68 insertions, 39 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 3d36a4c8..830798b8 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,20 @@ class EntriesExport
 {
    private $wallabagUrl;
    private $logoPath;
+    private $translator;
    private $title = '';
    private $entries = [];
-    private $authors = ['wallabag'];
+    private $author = 'wallabag';
    private $language = '';
-    private $footerTemplate = '<div style="text-align:center;">
-        <p>Produced by wallabag with %EXPORT_METHOD%</p>
-        <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p>
-        </div>';
    /**
-     * @param string $wallabagUrl Wallabag instance url
+     * @param TranslatorInterface $translator  Translator service
-     * @param string $logoPath    Path to the logo FROM THE BUNDLE SCOPE
+     * @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 +64,7 @@ class EntriesExport
     */
    public function updateTitle($method)
    {
-        $this->title = $method.' articles';
+        $this->title = $method . ' articles';
        if ('entry' === $method) {
            $this->title = $this->entries[0]->getTitle();
@@ -73,6 +74,33 @@ class EntriesExport
    }
    /**
+     * 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.
     *
     * @param string $format
@@ -81,7 +109,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 +134,12 @@ class EntriesExport
         */
        $content_start =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-            ."<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
+            . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
-            .'<head>'
+            . '<head>'
-            ."<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
+            . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
-            ."<title>wallabag articles book</title>\n"
+            . "<title>wallabag articles book</title>\n"
-            ."</head>\n"
+            . "</head>\n"
-            ."<body>\n";
+            . "<body>\n";
        $bookEnd = "</body>\n</html>\n";
@@ -128,9 +156,7 @@ class EntriesExport
        $book->setLanguage($this->language);
        $book->setDescription('Some articles saved on my wallabag');
-        foreach ($this->authors as $author) {
+        $book->setAuthor($this->author, $this->author);
-            $book->setAuthor($author, $author);
-        }
        // I hope this is a non existant address :)
        $book->setPublisher('wallabag', 'wallabag');
@@ -164,11 +190,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;
+            $chapter = $content_start . $entry->getContent() . $bookEnd;
-            $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
+            $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 +202,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 +222,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 +254,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 +273,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 +282,7 @@ class EntriesExport
         * Front page
         */
        $pdf->AddPage();
-        $intro = '<h1>'.$this->title.'</h1>'.$this->getExportInformation('tcpdf');
+        $intro = '<h1>' . $this->title . '</h1>' . $this->getExportInformation('tcpdf');
        $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
@@ -269,7 +295,7 @@ class EntriesExport
            }
            $pdf->AddPage();
-            $html = '<h1>'.$entry->getTitle().'</h1>';
+            $html = '<h1>' . $entry->getTitle() . '</h1>';
            $html .= $entry->getContent();
            $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
@@ -284,7 +310,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 +356,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 +374,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 +392,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 +408,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 .= "\n\n" . $bar . "\n\n" . $entry->getTitle() . "\n\n" . $bar . "\n\n";
-            $content .= trim(preg_replace('/\s+/S', ' ', strip_tags($entry->getContent())))."\n\n";
+            $html = new Html2Text($entry->getContent(), ['do_links' => 'none', 'width' => 100]);
+            $content .= $html->getText();
        }
        return Response::create(
@@ -391,7 +418,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 +429,7 @@ class EntriesExport
     *
     * @param string $format
     *
-     * @return Serializer
+     * @return string
     */
    private function prepareSerializingContent($format)
    {
@@ -424,10 +451,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%', '<img src="'.$this->logoPath.'" />', $info);
+            return str_replace('%IMAGE%', '<img src="' . $this->logoPath . '" />', $info);
        }
        return str_replace('%IMAGE%', '', $info);