X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FPocketController.php;h=a2dcd8a7f0ff5df767197780e03b73f3c84feeea;hb=ef75e1220ebb76a8df019d946460ad612759f0bb;hp=76d8417be0f5274708f0dd0d37abc30324c0ab2a;hpb=ff7b031d5792f7b6fd43b508d89397775bd1433c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index 76d8417b..a2dcd8a7 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -3,38 +3,109 @@
 namespace Wallabag\ImportBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Wallabag\ImportBundle\Import\PocketImport;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 
 class PocketController extends Controller
 {
     /**
-     * @Route("/import", name="import")
+     * Return Pocket Import Service with or without RabbitMQ enabled.
+     *
+     * @return \Wallabag\ImportBundle\Import\PocketImport
      */
-    public function importAction()
+    private function getPocketImportService()
     {
-        return $this->render('WallabagImportBundle:Pocket:index.html.twig', array());
+        $pocket = $this->get('wallabag_import.pocket.import');
+        $pocket->setUser($this->getUser());
+
+        if ($this->get('craue_config')->get('rabbitmq')) {
+            $pocket->setRabbitmqProducer($this->get('old_sound_rabbit_mq.wallabag_pocket_producer'));
+        }
+
+        return $pocket;
+    }
+
+    /**
+     * @Route("/pocket", name="import_pocket")
+     */
+    public function indexAction()
+    {
+        $pocket = $this->getPocketImportService();
+        $form = $this->createFormBuilder($pocket)
+            ->add('mark_as_read', CheckboxType::class, [
+                'label' => 'import.form.mark_as_read_label',
+                'required' => false,
+            ])
+            ->getForm();
+
+        return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
+            'import' => $this->getPocketImportService(),
+            'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true,
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
-     * @Route("/auth-pocket", name="authpocket")
+     * @Route("/pocket/auth", name="import_pocket_auth")
      */
-    public function authAction()
+    public function authAction(Request $request)
     {
-        $pocket = new PocketImport($this->get('security.token_storage'), $this->get('session'), $this->getDoctrine()->getManager(), $this->container->getParameter('pocket_consumer_key'));
-        $authUrl = $pocket->oAuthRequest($this->generateUrl('import', array(), true), $this->generateUrl('callbackpocket', array(), true));
+        $requestToken = $this->getPocketImportService()
+            ->getRequestToken($this->generateUrl('import', [], UrlGeneratorInterface::ABSOLUTE_URL));
 
-        return $this->redirect($authUrl, 301);
+        if (false === $requestToken) {
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'flashes.import.notice.failed'
+            );
+
+            return $this->redirect($this->generateUrl('import_pocket'));
+        }
+
+        $this->get('session')->set('import.pocket.code', $requestToken);
+        $this->get('session')->set('mark_as_read', $request->request->get('form')['mark_as_read']);
+
+        return $this->redirect(
+            'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+            301
+        );
     }
 
     /**
-     * @Route("/callback-pocket", name="callbackpocket")
+     * @Route("/pocket/callback", name="import_pocket_callback")
      */
     public function callbackAction()
     {
-        $pocket = new PocketImport($this->get('security.token_storage'), $this->get('session'), $this->getDoctrine()->getManager(), $this->container->getParameter('pocket_consumer_key'));
-        $accessToken = $pocket->oAuthAuthorize();
-        $pocket->import($accessToken);
+        $message = 'flashes.import.notice.failed';
+        $pocket = $this->getPocketImportService();
+
+        $markAsRead = $this->get('session')->get('mark_as_read');
+        $this->get('session')->remove('mark_as_read');
+
+        // something bad happend on pocket side
+        if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) {
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                $message
+            );
+
+            return $this->redirect($this->generateUrl('import_pocket'));
+        }
+
+        if (true === $pocket->setMarkAsRead($markAsRead)->import()) {
+            $summary = $pocket->getSummary();
+            $message = $this->get('translator')->trans('flashes.import.notice.summary', [
+                '%imported%' => $summary['imported'],
+                '%skipped%' => $summary['skipped'],
+            ]);
+        }
+
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            $message
+        );
 
         return $this->redirect($this->generateUrl('homepage'));
     }