diff options
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller/PocketController.php')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/PocketController.php | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 36ee25bf..56be5cbf 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -11,11 +11,30 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType; | |||
11 | class PocketController extends Controller | 11 | class PocketController extends Controller |
12 | { | 12 | { |
13 | /** | 13 | /** |
14 | * Return Pocket Import Service with or without RabbitMQ enabled. | ||
15 | * | ||
16 | * @return \Wallabag\ImportBundle\Import\PocketImport | ||
17 | */ | ||
18 | private function getPocketImportService() | ||
19 | { | ||
20 | $pocket = $this->get('wallabag_import.pocket.import'); | ||
21 | $pocket->setUser($this->getUser()); | ||
22 | |||
23 | if ($this->get('craue_config')->get('import_with_rabbitmq')) { | ||
24 | $pocket->setProducer($this->get('old_sound_rabbit_mq.import_pocket_producer')); | ||
25 | } elseif ($this->get('craue_config')->get('import_with_redis')) { | ||
26 | $pocket->setProducer($this->get('wallabag_import.producer.redis.pocket')); | ||
27 | } | ||
28 | |||
29 | return $pocket; | ||
30 | } | ||
31 | |||
32 | /** | ||
14 | * @Route("/pocket", name="import_pocket") | 33 | * @Route("/pocket", name="import_pocket") |
15 | */ | 34 | */ |
16 | public function indexAction() | 35 | public function indexAction() |
17 | { | 36 | { |
18 | $pocket = $this->get('wallabag_import.pocket.import'); | 37 | $pocket = $this->getPocketImportService(); |
19 | $form = $this->createFormBuilder($pocket) | 38 | $form = $this->createFormBuilder($pocket) |
20 | ->add('mark_as_read', CheckboxType::class, [ | 39 | ->add('mark_as_read', CheckboxType::class, [ |
21 | 'label' => 'import.form.mark_as_read_label', | 40 | 'label' => 'import.form.mark_as_read_label', |
@@ -24,8 +43,8 @@ class PocketController extends Controller | |||
24 | ->getForm(); | 43 | ->getForm(); |
25 | 44 | ||
26 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ | 45 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ |
27 | 'import' => $this->get('wallabag_import.pocket.import'), | 46 | 'import' => $this->getPocketImportService(), |
28 | 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, | 47 | 'has_consumer_key' => '' === trim($this->getUser()->getConfig()->getPocketConsumerKey()) ? false : true, |
29 | 'form' => $form->createView(), | 48 | 'form' => $form->createView(), |
30 | ]); | 49 | ]); |
31 | } | 50 | } |
@@ -35,7 +54,7 @@ class PocketController extends Controller | |||
35 | */ | 54 | */ |
36 | public function authAction(Request $request) | 55 | public function authAction(Request $request) |
37 | { | 56 | { |
38 | $requestToken = $this->get('wallabag_import.pocket.import') | 57 | $requestToken = $this->getPocketImportService() |
39 | ->getRequestToken($this->generateUrl('import', [], UrlGeneratorInterface::ABSOLUTE_URL)); | 58 | ->getRequestToken($this->generateUrl('import', [], UrlGeneratorInterface::ABSOLUTE_URL)); |
40 | 59 | ||
41 | if (false === $requestToken) { | 60 | if (false === $requestToken) { |
@@ -62,7 +81,7 @@ class PocketController extends Controller | |||
62 | public function callbackAction() | 81 | public function callbackAction() |
63 | { | 82 | { |
64 | $message = 'flashes.import.notice.failed'; | 83 | $message = 'flashes.import.notice.failed'; |
65 | $pocket = $this->get('wallabag_import.pocket.import'); | 84 | $pocket = $this->getPocketImportService(); |
66 | 85 | ||
67 | $markAsRead = $this->get('session')->get('mark_as_read'); | 86 | $markAsRead = $this->get('session')->get('mark_as_read'); |
68 | $this->get('session')->remove('mark_as_read'); | 87 | $this->get('session')->remove('mark_as_read'); |
@@ -83,6 +102,12 @@ class PocketController extends Controller | |||
83 | '%imported%' => $summary['imported'], | 102 | '%imported%' => $summary['imported'], |
84 | '%skipped%' => $summary['skipped'], | 103 | '%skipped%' => $summary['skipped'], |
85 | ]); | 104 | ]); |
105 | |||
106 | if (0 < $summary['queued']) { | ||
107 | $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [ | ||
108 | '%queued%' => $summary['queued'], | ||
109 | ]); | ||
110 | } | ||
86 | } | 111 | } |
87 | 112 | ||
88 | $this->get('session')->getFlashBag()->add( | 113 | $this->get('session')->getFlashBag()->add( |