X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FEntriesExport.php;h=5d2fca312be6cea75feecccbf7104af1d048ff50;hb=c779373f;hp=d749dcf91adc422a832ec207bed4362af4085f80;hpb=07320a2bd25c6ace1f9b1aa06b1b08e8dbf4f4fa;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index d749dcf9..5d2fca31 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 $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 string $logoPath    Path to the logo FROM THE BUNDLE SCOPE
+     * @param TranslatorInterface $translator  Translator service
+     * @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;
     }
@@ -73,7 +74,9 @@ class EntriesExport
     }
 
     /**
-     * Sets the author for just one entry.
+     * 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
      *
@@ -81,10 +84,17 @@ class EntriesExport
      */
     public function updateAuthor($method)
     {
-        $this->author = $method.' authors';
+        if ('entry' !== $method) {
+            $this->author = $method . ' authors';
 
-        if ('entry' === $method) {
-            $this->author = $this->entries[0]->getDomainName();
+            return $this;
+        }
+
+        $this->author = $this->entries[0]->getDomainName();
+
+        $publishedBy = $this->entries[0]->getPublishedBy();
+        if (!empty($publishedBy)) {
+            $this->author = implode(', ', $publishedBy);
         }
 
         return $this;
@@ -164,8 +174,6 @@ class EntriesExport
             $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
         }
 
-        $book->buildTOC();
-
         /*
          * Adding actual entries
          */
@@ -180,11 +188,13 @@ class EntriesExport
             // in filenames, we limit to A-z/0-9
             $filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle());
 
+            $titlepage = $content_start . "<h1>".$entry->getTitle()."</h1>" . $this->getExportInformation('PHPePub') . $bookEnd;
+            $book->addChapter("Title", 'Title.html', $titlepage, 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->buildTOC();
 
         return Response::create(
             $book->getBook(),
@@ -399,7 +409,8 @@ class EntriesExport
         $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";
+            $html = new Html2Text($entry->getContent(), ['do_links' => 'none', 'width' => 100]);
+            $content .= $html->getText();
         }
 
         return Response::create(
@@ -418,7 +429,7 @@ class EntriesExport
      *
      * @param string $format
      *
-     * @return Serializer
+     * @return string
      */
     private function prepareSerializingContent($format)
     {
@@ -440,7 +451,9 @@ 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);