Merge remote-tracking branch 'origin/2.6' into port/2.6.10

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

src/Command/Import/ImportCommand.php

@@ -19,6 +19,7 @@ use Wallabag\Import\DeliciousImport;
 use Wallabag\Import\ElcuratorImport;
 use Wallabag\Import\FirefoxImport;
 use Wallabag\Import\InstapaperImport;
+use Wallabag\Import\OmnivoreImport;
 use Wallabag\Import\PinboardImport;
 use Wallabag\Import\PocketHtmlImport;
 use Wallabag\Import\ReadabilityImport;
@@ -42,6 +43,7 @@ class ImportCommand extends Command
     private InstapaperImport $instapaperImport;
     private PinboardImport $pinboardImport;
     private DeliciousImport $deliciousImport;
+    private OmnivoreImport $omnivoreImport;
     private WallabagV1Import $wallabagV1Import;
     private ElcuratorImport $elcuratorImport;
     private ShaarliImport $shaarliImport;
@@ -61,7 +63,8 @@ class ImportCommand extends Command
         WallabagV1Import $wallabagV1Import,
         ElcuratorImport $elcuratorImport,
         ShaarliImport $shaarliImport,
-        PocketHtmlImport $pocketHtmlImport
+        PocketHtmlImport $pocketHtmlImport,
+        OmnivoreImport $omnivoreImport
     ) {
         $this->entityManager = $entityManager;
         $this->tokenStorage = $tokenStorage;
@@ -73,6 +76,7 @@ class ImportCommand extends Command
         $this->instapaperImport = $instapaperImport;
         $this->pinboardImport = $pinboardImport;
         $this->deliciousImport = $deliciousImport;
+        $this->omnivoreImport = $omnivoreImport;
         $this->wallabagV1Import = $wallabagV1Import;
         $this->elcuratorImport = $elcuratorImport;
         $this->shaarliImport = $shaarliImport;
@@ -159,6 +163,9 @@ class ImportCommand extends Command
             case 'pocket':
                 $import = $this->pocketHtmlImport;
                 break;
+            case 'omnivore':
+                $import = $this->omnivoreImport;
+                break;
             default:
                 $import = $this->wallabagV1Import;
         }

src/Command/Import/RedisWorkerCommand.php

@@ -28,7 +28,7 @@ class RedisWorkerCommand extends Command
     protected function configure()
     {
         $this
-            ->addArgument('serviceName', InputArgument::REQUIRED, 'Service to use: wallabag_v1, wallabag_v2, pocket, readability, pinboard, delicious, firefox, chrome or instapaper')
+            ->addArgument('serviceName', InputArgument::REQUIRED, 'Service to use: wallabag_v1, wallabag_v2, pocket, readability, pinboard, delicious, omnivore, firefox, chrome or instapaper')
             ->addOption('maxIterations', '', InputOption::VALUE_OPTIONAL, 'Number of iterations before stopping', false)
         ;
     }

src/Consumer/RabbitMQConsumerTotalProxy.php

@@ -22,6 +22,7 @@ class RabbitMQConsumerTotalProxy
     private Consumer $elcuratorConsumer;
     private Consumer $shaarliConsumer;
     private Consumer $pocketHtmlConsumer;
+    private Consumer $omnivoreConsumer;
 
     public function __construct(
         Consumer $pocketConsumer,
@@ -35,7 +36,8 @@ class RabbitMQConsumerTotalProxy
         Consumer $deliciousConsumer,
         Consumer $elcuratorConsumer,
         Consumer $shaarliConsumer,
-        Consumer $pocketHtmlConsumer
+        Consumer $pocketHtmlConsumer,
+        Consumer $omnivoreConsumer
     ) {
         $this->pocketConsumer = $pocketConsumer;
         $this->readabilityConsumer = $readabilityConsumer;
@@ -49,6 +51,7 @@ class RabbitMQConsumerTotalProxy
         $this->elcuratorConsumer = $elcuratorConsumer;
         $this->shaarliConsumer = $shaarliConsumer;
         $this->pocketHtmlConsumer = $pocketHtmlConsumer;
+        $this->omnivoreConsumer = $omnivoreConsumer;
     }
 
     /**
@@ -99,6 +102,9 @@ class RabbitMQConsumerTotalProxy
             case 'pocket_html':
                 $consumer = $this->pocketHtmlConsumer;
                 break;
+            case 'omnivore':
+                $consumer = $this->omnivoreConsumer;
+                break;
             default:
                 return 0;
         }

src/Controller/EntryController.php

@@ -602,7 +602,7 @@ class EntryController extends AbstractController
      *
      * @param int $page
      *
-     * @Route("/domain/{id}/{page}", requirements={"id" = ".+"}, defaults={"page" = 1}, name="same_domain")
+     * @Route("/domain/{id}/{page}", requirements={"id" = "\d+"}, defaults={"page" = 1}, name="same_domain")
      * @IsGranted("LIST_ENTRIES")
      *
      * @return Response

src/Controller/Import/ImportController.php

@@ -59,6 +59,7 @@ class ImportController extends AbstractController
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('elcurator')
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('shaarli')
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('pocket_html')
+                    + $this->rabbitMQConsumerTotalProxy->getTotalMessage('omnivore')
                 ;
             } catch (\Exception $e) {
                 $rabbitNotInstalled = true;
@@ -79,6 +80,7 @@ class ImportController extends AbstractController
                     + $redis->llen('wallabag.import.elcurator')
                     + $redis->llen('wallabag.import.shaarli')
                     + $redis->llen('wallabag.import.pocket_html')
+                    + $redis->llen('wallabag.import.omnivore')
                 ;
             } catch (\Exception $e) {
                 $redisNotInstalled = true;

src/Controller/Import/OmnivoreController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Wallabag\Controller\Import;
+
+use Craue\ConfigBundle\Util\Config;
+use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\OmnivoreImport;
+use Wallabag\Redis\Producer as RedisProducer;
+
+class OmnivoreController extends AbstractController
+{
+    private RabbitMqProducer $rabbitMqProducer;
+    private RedisProducer $redisProducer;
+
+    public function __construct(RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
+    {
+        $this->rabbitMqProducer = $rabbitMqProducer;
+        $this->redisProducer = $redisProducer;
+    }
+
+    /**
+     * @Route("/import/omnivore", name="import_omnivore")
+     */
+    public function indexAction(Request $request, OmnivoreImport $omnivore, Config $craueConfig, TranslatorInterface $translator)
+    {
+        $form = $this->createForm(UploadImportType::class);
+        $form->handleRequest($request);
+
+        $omnivore->setUser($this->getUser());
+
+        if ($craueConfig->get('import_with_rabbitmq')) {
+            $omnivore->setProducer($this->rabbitMqProducer);
+        } elseif ($craueConfig->get('import_with_redis')) {
+            $omnivore->setProducer($this->redisProducer);
+        }
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $file = $form->get('file')->getData();
+            $markAsRead = $form->get('mark_as_read')->getData();
+            $name = 'omnivore_' . $this->getUser()->getId() . '.json';
+
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
+                $res = $omnivore
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
+                    ->setMarkAsRead($markAsRead)
+                    ->import();
+
+                $message = 'flashes.import.notice.failed';
+
+                if (true === $res) {
+                    $summary = $omnivore->getSummary();
+                    $message = $translator->trans('flashes.import.notice.summary', [
+                        '%imported%' => $summary['imported'],
+                        '%skipped%' => $summary['skipped'],
+                    ]);
+
+                    if (0 < $summary['queued']) {
+                        $message = $translator->trans('flashes.import.notice.summary_with_queue', [
+                            '%queued%' => $summary['queued'],
+                        ]);
+                    }
+
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
+                }
+
+                $this->addFlash('notice', $message);
+
+                return $this->redirect($this->generateUrl('homepage'));
+            }
+
+            $this->addFlash('notice', 'flashes.import.notice.failed_on_file');
+        }
+
+        return $this->render('Import/Omnivore/index.html.twig', [
+            'form' => $form->createView(),
+            'import' => $omnivore,
+        ]);
+    }
+}

src/Import/OmnivoreImport.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Wallabag\Import;
+
+use Wallabag\Entity\Entry;
+
+class OmnivoreImport extends AbstractImport
+{
+    private $filepath;
+
+    public function getName()
+    {
+        return 'Omnivore';
+    }
+
+    public function getUrl()
+    {
+        return 'import_omnivore';
+    }
+
+    public function getDescription()
+    {
+        return 'import.omnivore.description';
+    }
+
+    /**
+     * Set file path to the json file.
+     *
+     * @param string $filepath
+     */
+    public function setFilepath($filepath)
+    {
+        $this->filepath = $filepath;
+
+        return $this;
+    }
+
+    public function import()
+    {
+        if (!$this->user) {
+            $this->logger->error('OmnivoreImport: user is not defined');
+
+            return false;
+        }
+
+        if (!file_exists($this->filepath) || !is_readable($this->filepath)) {
+            $this->logger->error('OmnivoreImport: unable to read file', ['filepath' => $this->filepath]);
+
+            return false;
+        }
+
+        $data = json_decode(file_get_contents($this->filepath), true);
+
+        if (empty($data)) {
+            $this->logger->error('OmnivoreImport: no entries in imported file');
+
+            return false;
+        }
+
+        if ($this->producer) {
+            $this->parseEntriesForProducer($data);
+
+            return true;
+        }
+
+        $this->parseEntries($data);
+
+        return true;
+    }
+
+    public function validateEntry(array $importedEntry)
+    {
+        if (empty($importedEntry['url'])) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function parseEntry(array $importedEntry)
+    {
+        $existingEntry = $this->em
+            ->getRepository(Entry::class)
+            ->findByUrlAndUserId($importedEntry['url'], $this->user->getId());
+
+        if (false !== $existingEntry) {
+            ++$this->skippedEntries;
+
+            return null;
+        }
+
+        $data = [
+            'title' => $importedEntry['title'],
+            'url' => $importedEntry['url'],
+            'is_archived' => ('Archived' === $importedEntry['state']) || $this->markAsRead,
+            'is_starred' => false,
+            'created_at' => $importedEntry['savedAt'],
+            'tags' => $importedEntry['labels'],
+            'published_by' => [$importedEntry['author']],
+            'published_at' => $importedEntry['publishedAt'],
+            'preview_picture' => $importedEntry['thumbnail'],
+        ];
+
+        $entry = new Entry($this->user);
+        $entry->setUrl($data['url']);
+        $entry->setTitle($data['title']);
+
+        // update entry with content (in case fetching failed, the given entry will be return)
+        $this->fetchContent($entry, $data['url'], $data);
+
+        if (!empty($data['tags'])) {
+            $this->tagsAssigner->assignTagsToEntry(
+                $entry,
+                $data['tags'],
+                $this->em->getUnitOfWork()->getScheduledEntityInsertions()
+            );
+        }
+
+        $entry->updateArchived($data['is_archived']);
+        $entry->setCreatedAt(\DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z', $data['created_at']));
+        if (null !== $data['published_at']) {
+            $entry->setPublishedAt(\DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z', $data['published_at']));
+        }
+        $entry->setPublishedBy($data['published_by']);
+        $entry->setPreviewPicture($data['preview_picture']);
+
+        $this->em->persist($entry);
+        ++$this->importedEntries;
+
+        return $entry;
+    }
+
+    protected function setEntryAsRead(array $importedEntry)
+    {
+        return $importedEntry;
+    }
+}