X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FPocketController.php;h=9f28819aae2ac3bb591d97c0a19c437fddbb90e3;hb=f808b01692a835673f328d7221ba8c212caa9b61;hp=ffd0c9abb20b86ddb3fa5520d64df706dcf79569;hpb=1f4408de9ed08f3b0fda45a93f1585c80feeb21d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index ffd0c9ab..9f28819a 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -2,138 +2,119 @@
 
 namespace Wallabag\ImportBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\HttpFoundation\Request;
-use GuzzleHttp\Client;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Tools\Utils;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class PocketController extends Controller
 {
     /**
-     * @Route("/import", name="import")
+     * @Route("/pocket", name="import_pocket")
      */
-    public function importAction()
+    public function indexAction()
     {
-        return $this->render('WallabagImportBundle:Pocket:index.html.twig', array());
-    }
-
-    /**
-     * Create a new Client.
-     *
-     * @return Client
-     */
-    private function createClient()
-    {
-        return new Client([
-            'defaults' => [
-                'headers' => [
-                    'content-type' => 'application/json',
-                    'X-Accept' => 'application/json',
-                ],
-            ],
+        $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->getUser()->getConfig()->getPocketConsumerKey()) ? 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)
     {
-        $client = $this->createClient();
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'redirect_uri' => $this->generateUrl('import', array(), true),
-                ]),
-            ]
-        );
+        $requestToken = $this->getPocketImportService()
+            ->getRequestToken($this->generateUrl('import', [], UrlGeneratorInterface::ABSOLUTE_URL));
 
-        $response = $client->send($request);
-        $values = $response->json();
-        $code = $values['code'];
+        if (false === $requestToken) {
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'flashes.import.notice.failed'
+            );
 
-        // store code in session for callback method
-        $session = $this->get('session');
-        $session->set('pocketCode',  $code);
+            return $this->redirect($this->generateUrl('import_pocket'));
+        }
 
-        $url = 'https://getpocket.com/auth/authorize?request_token='.$code.'&redirect_uri='.$this->generateUrl('callbackpocket', array(), true);
+        $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($url, 301);
+        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()
     {
-        $client = $this->createClient();
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'code' => $this->get('session')->get('pocketCode'),
-                ]),
-            ]
-        );
+        $message = 'flashes.import.notice.failed';
+        $pocket = $this->getPocketImportService();
 
-        $response = $client->send($request);
-        $values = $response->json();
-        $accessToken = $values['access_token'];
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/get',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'access_token' => $accessToken,
-                    'detailType' => 'complete',
-                ]),
-            ]
-        );
+        $markAsRead = $this->get('session')->get('mark_as_read');
+        $this->get('session')->remove('mark_as_read');
 
-        $response = $client->send($request);
-        $entries = $response->json();
+        // something bad happend on pocket side
+        if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) {
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                $message
+            );
 
-        $this->parsePocketEntries($entries['list']);
+            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'],
+            ]);
+
+            if (0 < $summary['queued']) {
+                $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+                    '%queued%' => $summary['queued'],
+                ]);
+            }
+        }
 
         $this->get('session')->getFlashBag()->add(
             'notice',
-            count($entries['list']).' entries imported'
+            $message
         );
 
         return $this->redirect($this->generateUrl('homepage'));
     }
 
     /**
-     * @param $entries
+     * Return Pocket Import Service with or without RabbitMQ enabled.
+     *
+     * @return \Wallabag\ImportBundle\Import\PocketImport
      */
-    private function parsePocketEntries($entries)
+    private function getPocketImportService()
     {
-        $em = $this->getDoctrine()->getManager();
-
-        foreach ($entries as $entry) {
-            $newEntry = new Entry($this->getUser());
-            $newEntry->setUrl($entry['given_url']);
-            $newEntry->setTitle(isset($entry['resolved_title']) ? $entry['resolved_title'] : (isset($entry['given_title']) ? $entry['given_title'] : 'Untitled'));
-
-            if (isset($entry['excerpt'])) {
-                $newEntry->setContent($entry['excerpt']);
-            }
-
-            if (isset($entry['has_image']) && $entry['has_image'] > 0) {
-                $newEntry->setPreviewPicture($entry['image']['src']);
-            }
-
-            if (isset($entry['word_count'])) {
-                $newEntry->setReadingTime(Utils::convertWordsToMinutes($entry['word_count']));
-            }
+        $pocket = $this->get('wallabag_import.pocket.import');
+        $pocket->setUser($this->getUser());
 
-            $em->persist($newEntry);
+        if ($this->get('craue_config')->get('import_with_rabbitmq')) {
+            $pocket->setProducer($this->get('old_sound_rabbit_mq.import_pocket_producer'));
+        } elseif ($this->get('craue_config')->get('import_with_redis')) {
+            $pocket->setProducer($this->get('wallabag_import.producer.redis.pocket'));
         }
 
-        $em->flush();
+        return $pocket;
     }
 }