Add Shaarli and Pocket HTML imports

src/Wallabag/ImportBundle/Controller/HtmlController.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Wallabag\ImportBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Wallabag\ImportBundle\Form\Type\UploadImportType;
+use Wallabag\ImportBundle\Import\ImportInterface;
+
+abstract class HtmlController extends AbstractController
+{
+    /**
+     * @Route("/html", name="import_html")
+     *
+     * @return Response
+     */
+    public function indexAction(Request $request, TranslatorInterface $translator)
+    {
+        $form = $this->createForm(UploadImportType::class);
+        $form->handleRequest($request);
+
+        $wallabag = $this->getImportService();
+        $wallabag->setUser($this->getUser());
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $file = $form->get('file')->getData();
+            $markAsRead = $form->get('mark_as_read')->getData();
+            $name = $this->getUser()->getId() . '.html';
+
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+                $res = $wallabag
+                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setMarkAsRead($markAsRead)
+                    ->import();
+
+                $message = 'flashes.import.notice.failed';
+
+                if (true === $res) {
+                    $summary = $wallabag->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_import.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($this->getImportTemplate(), [
+            'form' => $form->createView(),
+            'import' => $wallabag,
+        ]);
+    }
+
+    /**
+     * Return the service to handle the import.
+     *
+     * @return ImportInterface
+     */
+    abstract protected function getImportService();
+
+    /**
+     * Return the template used for the form.
+     *
+     * @return string
+     */
+    abstract protected function getImportTemplate();
+}

src/Wallabag/ImportBundle/Controller/ImportController.php

@@ -57,6 +57,8 @@ class ImportController extends AbstractController
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('pinboard')
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('delicious')
                     + $this->rabbitMQConsumerTotalProxy->getTotalMessage('elcurator')
+                    + $this->rabbitMQConsumerTotalProxy->getTotalMessage('shaarli')
+                    + $this->rabbitMQConsumerTotalProxy->getTotalMessage('pocket_html')
                 ;
             } catch (\Exception $e) {
                 $rabbitNotInstalled = true;
@@ -75,6 +77,8 @@ class ImportController extends AbstractController
                     + $redis->llen('wallabag.import.pinboard')
                     + $redis->llen('wallabag.import.delicious')
                     + $redis->llen('wallabag.import.elcurator')
+                    + $redis->llen('wallabag.import.shaarli')
+                    + $redis->llen('wallabag.import.pocket_html')
                 ;
             } catch (\Exception $e) {
                 $redisNotInstalled = true;

src/Wallabag/ImportBundle/Controller/PocketHtmlController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Wallabag\ImportBundle\Controller;
+
+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\ImportBundle\Import\PocketHtmlImport;
+use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+
+class PocketHtmlController extends HtmlController
+{
+    private PocketHtmlImport $pocketHtmlImport;
+    private Config $craueConfig;
+    private RabbitMqProducer $rabbitMqProducer;
+    private RedisProducer $redisProducer;
+
+    public function __construct(PocketHtmlImport $pocketHtmlImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
+    {
+        $this->pocketHtmlImport = $pocketHtmlImport;
+        $this->craueConfig = $craueConfig;
+        $this->rabbitMqProducer = $rabbitMqProducer;
+        $this->redisProducer = $redisProducer;
+    }
+
+    /**
+     * @Route("/pocket_html", name="import_pocket_html")
+     */
+    public function indexAction(Request $request, TranslatorInterface $translator)
+    {
+        return parent::indexAction($request, $translator);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getImportService()
+    {
+        if ($this->craueConfig->get('import_with_rabbitmq')) {
+            $this->pocketHtmlImport->setProducer($this->rabbitMqProducer);
+        } elseif ($this->craueConfig->get('import_with_redis')) {
+            $this->pocketHtmlImport->setProducer($this->redisProducer);
+        }
+
+        return $this->pocketHtmlImport;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getImportTemplate()
+    {
+        return '@WallabagImport/PocketHtml/index.html.twig';
+    }
+}

src/Wallabag/ImportBundle/Controller/ShaarliController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Wallabag\ImportBundle\Controller;
+
+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\ImportBundle\Import\ShaarliImport;
+use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+
+class ShaarliController extends HtmlController
+{
+    private ShaarliImport $shaarliImport;
+    private Config $craueConfig;
+    private RabbitMqProducer $rabbitMqProducer;
+    private RedisProducer $redisProducer;
+
+    public function __construct(ShaarliImport $shaarliImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
+    {
+        $this->shaarliImport = $shaarliImport;
+        $this->craueConfig = $craueConfig;
+        $this->rabbitMqProducer = $rabbitMqProducer;
+        $this->redisProducer = $redisProducer;
+    }
+
+    /**
+     * @Route("/shaarli", name="import_shaarli")
+     */
+    public function indexAction(Request $request, TranslatorInterface $translator)
+    {
+        return parent::indexAction($request, $translator);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getImportService()
+    {
+        if ($this->craueConfig->get('import_with_rabbitmq')) {
+            $this->shaarliImport->setProducer($this->rabbitMqProducer);
+        } elseif ($this->craueConfig->get('import_with_redis')) {
+            $this->shaarliImport->setProducer($this->redisProducer);
+        }
+
+        return $this->shaarliImport;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getImportTemplate()
+    {
+        return '@WallabagImport/Shaarli/index.html.twig';
+    }
+}