pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move to controller as a service

Browse Source 
Mostly using autowiring to inject deps.
The only tricky part was for import because all producer use the same class and have a different alias. So we must write them down in the service definition, autowiring doesn't work in that case.

Usually:
- if a controller has a constructor, it means injected services are at least re-used once in actions
- otherwise, service are injected per action
This commit is contained in:
Jeremy Benoist
2022-12-19 10:37:22 +01:00
parent 39f603e015
commit 6aca334d53
36 changed files with 855 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Wallabag/ImportBundle/Controller/BrowserController.php
View File

@ -2,23 +2,22 @@
namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ImportInterface;
abstract class BrowserController extends Controller
abstract class BrowserController extends AbstractController
{
/**
* @Route("/browser", name="import_browser")
*
* @return Response
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
@ -41,13 +40,13 @@ abstract class BrowserController extends Controller
if (true === $res) {
$summary = $wallabag->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -55,17 +54,11 @@ abstract class BrowserController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render($this->getImportTemplate(), [

32
src/Wallabag/ImportBundle/Controller/ChromeController.php
View File

@ -3,18 +3,34 @@
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\ChromeImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class ChromeController extends BrowserController
{
private ChromeImport $chromeImport;
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(ChromeImport $chromeImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->chromeImport = $chromeImport;
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/chrome", name="import_chrome")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
return parent::indexAction($request);
return parent::indexAction($request, $translator);
}
/**
@ -22,15 +38,13 @@ class ChromeController extends BrowserController
*/
protected function getImportService()
{
$service = $this->get(ChromeImport::class);
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_chrome_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$service->setProducer($this->get('wallabag_import.producer.redis.chrome'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$this->chromeImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$this->chromeImport->setProducer($this->redisProducer);
}
return $service;
return $this->chromeImport;
}
/**

43
src/Wallabag/ImportBundle/Controller/DeliciousController.php
View File

@ -3,31 +3,40 @@
namespace Wallabag\ImportBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\DeliciousImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class DeliciousController extends Controller
class DeliciousController extends AbstractController
{
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/delicious", name="import_delicious")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, DeliciousImport $delicious, Config $craueConfig, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$delicious = $this->get(DeliciousImport::class);
$delicious->setUser($this->getUser());
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$delicious->setProducer($this->get('old_sound_rabbit_mq.import_delicious_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$delicious->setProducer($this->get('wallabag_import.producer.redis.delicious'));
if ($craueConfig->get('import_with_rabbitmq')) {
$delicious->setProducer($this->rabbitMqProducer);
} elseif ($craueConfig->get('import_with_redis')) {
$delicious->setProducer($this->redisProducer);
}
if ($form->isSubmitted() && $form->isValid()) {
@ -45,13 +54,13 @@ class DeliciousController extends Controller
if (true === $res) {
$summary = $delicious->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -59,18 +68,12 @@ class DeliciousController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Delicious/index.html.twig', [

32
src/Wallabag/ImportBundle/Controller/ElcuratorController.php
View File

@ -3,18 +3,34 @@
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\ElcuratorImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class ElcuratorController extends WallabagController
{
private ElcuratorImport $elcuratorImport;
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(ElcuratorImport $elcuratorImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->elcuratorImport = $elcuratorImport;
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/elcurator", name="import_elcurator")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
return parent::indexAction($request);
return parent::indexAction($request, $translator);
}
/**
@ -22,15 +38,13 @@ class ElcuratorController extends WallabagController
*/
protected function getImportService()
{
$service = $this->get(ElcuratorImport::class);
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_elcurator_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$service->setProducer($this->get('wallabag_import.producer.redis.elcurator'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$this->elcuratorImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$this->elcuratorImport->setProducer($this->redisProducer);
}
return $service;
return $this->elcuratorImport;
}
/**

32
src/Wallabag/ImportBundle/Controller/FirefoxController.php
View File

@ -3,18 +3,34 @@
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\FirefoxImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class FirefoxController extends BrowserController
{
private FirefoxImport $firefoxImport;
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(FirefoxImport $firefoxImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->firefoxImport = $firefoxImport;
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/firefox", name="import_firefox")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
return parent::indexAction($request);
return parent::indexAction($request, $translator);
}
/**
@ -22,15 +38,13 @@ class FirefoxController extends BrowserController
*/
protected function getImportService()
{
$service = $this->get(FirefoxImport::class);
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_firefox_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$service->setProducer($this->get('wallabag_import.producer.redis.firefox'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$this->firefoxImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$this->firefoxImport->setProducer($this->redisProducer);
}
return $service;
return $this->firefoxImport;
}
/**

43
src/Wallabag/ImportBundle/Controller/InstapaperController.php
View File

@ -3,31 +3,40 @@
namespace Wallabag\ImportBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\InstapaperImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class InstapaperController extends Controller
class InstapaperController extends AbstractController
{
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/instapaper", name="import_instapaper")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, InstapaperImport $instapaper, Config $craueConfig, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$instapaper = $this->get(InstapaperImport::class);
$instapaper->setUser($this->getUser());
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$instapaper->setProducer($this->get('old_sound_rabbit_mq.import_instapaper_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$instapaper->setProducer($this->get('wallabag_import.producer.redis.instapaper'));
if ($craueConfig->get('import_with_rabbitmq')) {
$instapaper->setProducer($this->rabbitMqProducer);
} elseif ($craueConfig->get('import_with_redis')) {
$instapaper->setProducer($this->redisProducer);
}
if ($form->isSubmitted() && $form->isValid()) {
@ -45,13 +54,13 @@ class InstapaperController extends Controller
if (true === $res) {
$summary = $instapaper->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -59,18 +68,12 @@ class InstapaperController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Instapaper/index.html.twig', [

43
src/Wallabag/ImportBundle/Controller/PinboardController.php
View File

@ -3,31 +3,40 @@
namespace Wallabag\ImportBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\PinboardImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class PinboardController extends Controller
class PinboardController extends AbstractController
{
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/pinboard", name="import_pinboard")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, PinboardImport $pinboard, Config $craueConfig, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$pinboard = $this->get(PinboardImport::class);
$pinboard->setUser($this->getUser());
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$pinboard->setProducer($this->get('old_sound_rabbit_mq.import_pinboard_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$pinboard->setProducer($this->get('wallabag_import.producer.redis.pinboard'));
if ($craueConfig->get('import_with_rabbitmq')) {
$pinboard->setProducer($this->rabbitMqProducer);
} elseif ($craueConfig->get('import_with_redis')) {
$pinboard->setProducer($this->redisProducer);
}
if ($form->isSubmitted() && $form->isValid()) {
@ -45,13 +54,13 @@ class PinboardController extends Controller
if (true === $res) {
$summary = $pinboard->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -59,18 +68,12 @@ class PinboardController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Pinboard/index.html.twig', [

79
src/Wallabag/ImportBundle/Controller/PocketController.php
View File

@ -3,23 +3,39 @@
namespace Wallabag\ImportBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\PocketImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class PocketController extends Controller
class PocketController extends AbstractController
{
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
private SessionInterface $session;
public function __construct(Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer, SessionInterface $session)
{
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
$this->session = $session;
}
/**
* @Route("/pocket", name="import_pocket")
*/
public function indexAction()
public function indexAction(PocketImport $pocketImport)
{
$pocket = $this->getPocketImportService();
$pocket = $this->getPocketImportService($pocketImport);
$form = $this->createFormBuilder($pocket)
->add('mark_as_read', CheckboxType::class, [
'label' => 'import.form.mark_as_read_label',
@ -28,7 +44,7 @@ class PocketController extends Controller
->getForm();
return $this->render('@WallabagImport/Pocket/index.html.twig', [
'import' => $this->getPocketImportService(),
'import' => $pocket,
'has_consumer_key' => '' === trim($this->getUser()->getConfig()->getPocketConsumerKey()) ? false : true,
'form' => $form->createView(),
]);
@ -37,13 +53,13 @@ class PocketController extends Controller
/**
* @Route("/pocket/auth", name="import_pocket_auth")
*/
public function authAction(Request $request)
public function authAction(Request $request, PocketImport $pocketImport)
{
$requestToken = $this->getPocketImportService()
$requestToken = $this->getPocketImportService($pocketImport)
->getRequestToken($this->generateUrl('import', [], UrlGeneratorInterface::ABSOLUTE_URL));
if (false === $requestToken) {
$this->get(SessionInterface::class)->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.import.notice.failed'
);
@ -53,9 +69,9 @@ class PocketController extends Controller
$form = $request->request->get('form');
$this->get(SessionInterface::class)->set('import.pocket.code', $requestToken);
$this->session->set('import.pocket.code', $requestToken);
if (null !== $form && \array_key_exists('mark_as_read', $form)) {
$this->get(SessionInterface::class)->set('mark_as_read', $form['mark_as_read']);
$this->session->set('mark_as_read', $form['mark_as_read']);
}
return $this->redirect(
@ -67,62 +83,53 @@ class PocketController extends Controller
/**
* @Route("/pocket/callback", name="import_pocket_callback")
*/
public function callbackAction()
public function callbackAction(PocketImport $pocketImport, TranslatorInterface $translator)
{
$message = 'flashes.import.notice.failed';
$pocket = $this->getPocketImportService();
$pocket = $this->getPocketImportService($pocketImport);
$markAsRead = $this->get(SessionInterface::class)->get('mark_as_read');
$this->get(SessionInterface::class)->remove('mark_as_read');
$markAsRead = $this->session->get('mark_as_read');
$this->session->remove('mark_as_read');
// something bad happend on pocket side
if (false === $pocket->authorize($this->get(SessionInterface::class)->get('import.pocket.code'))) {
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
if (false === $pocket->authorize($this->session->get('import.pocket.code'))) {
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('import_pocket'));
}
if (true === $pocket->setMarkAsRead($markAsRead)->import()) {
$summary = $pocket->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => null !== $summary && \array_key_exists('imported', $summary) ? $summary['imported'] : 0,
'%skipped%' => null !== $summary && \array_key_exists('skipped', $summary) ? $summary['skipped'] : 0,
]);
if (null !== $summary && \array_key_exists('queued', $summary) && 0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
/**
* Return Pocket Import Service with or without RabbitMQ enabled.
*
* @return PocketImport
*/
private function getPocketImportService()
private function getPocketImportService(PocketImport $pocketImport): PocketImport
{
$pocket = $this->get(PocketImport::class);
$pocket->setUser($this->getUser());
$pocketImport->setUser($this->getUser());
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$pocket->setProducer($this->get('old_sound_rabbit_mq.import_pocket_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$pocket->setProducer($this->get('wallabag_import.producer.redis.pocket'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$pocketImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$pocketImport->setProducer($this->redisProducer);
}
return $pocket;
return $pocketImport;
}
}

43
src/Wallabag/ImportBundle/Controller/ReadabilityController.php
View File

@ -3,31 +3,40 @@
namespace Wallabag\ImportBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ReadabilityImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class ReadabilityController extends Controller
class ReadabilityController extends AbstractController
{
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/readability", name="import_readability")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, ReadabilityImport $readability, Config $craueConfig, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$readability = $this->get(ReadabilityImport::class);
$readability->setUser($this->getUser());
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$readability->setProducer($this->get('old_sound_rabbit_mq.import_readability_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$readability->setProducer($this->get('wallabag_import.producer.redis.readability'));
if ($craueConfig->get('import_with_rabbitmq')) {
$readability->setProducer($this->rabbitMqProducer);
} elseif ($craueConfig->get('import_with_redis')) {
$readability->setProducer($this->redisProducer);
}
if ($form->isSubmitted() && $form->isValid()) {
@ -45,13 +54,13 @@ class ReadabilityController extends Controller
if (true === $res) {
$summary = $readability->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -59,18 +68,12 @@ class ReadabilityController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Readability/index.html.twig', [

23
src/Wallabag/ImportBundle/Controller/WallabagController.php
View File

@ -2,26 +2,25 @@
namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ImportInterface;
/**
* Define Wallabag import for v1 and v2, since there are very similar.
*/
abstract class WallabagController extends Controller
abstract class WallabagController extends AbstractController
{
/**
* Handle import request.
*
* @return Response|RedirectResponse
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
@ -44,13 +43,13 @@ abstract class WallabagController extends Controller
if (true === $res) {
$summary = $wallabag->getSummary();
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary', [
$message = $translator->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
if (0 < $summary['queued']) {
$message = $this->get(TranslatorInterface::class)->trans('flashes.import.notice.summary_with_queue', [
$message = $translator->trans('flashes.import.notice.summary_with_queue', [
'%queued%' => $summary['queued'],
]);
}
@ -58,18 +57,12 @@ abstract class WallabagController extends Controller
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
$message
);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render($this->getImportTemplate(), [

32
src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php
View File

@ -3,18 +3,34 @@
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\WallabagV1Import;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class WallabagV1Controller extends WallabagController
{
private WallabagV1Import $wallabagImport;
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(WallabagV1Import $wallabagImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->wallabagImport = $wallabagImport;
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/wallabag-v1", name="import_wallabag_v1")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
return parent::indexAction($request);
return parent::indexAction($request, $translator);
}
/**
@ -22,15 +38,13 @@ class WallabagV1Controller extends WallabagController
*/
protected function getImportService()
{
$service = $this->get(WallabagV1Import::class);
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_wallabag_v1_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$service->setProducer($this->get('wallabag_import.producer.redis.wallabag_v1'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$this->wallabagImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$this->wallabagImport->setProducer($this->redisProducer);
}
return $service;
return $this->wallabagImport;
}
/**

32
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php
View File

@ -3,18 +3,34 @@
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\WallabagV2Import;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
class WallabagV2Controller extends WallabagController
{
private WallabagV2Import $wallabagImport;
private Config $craueConfig;
private RabbitMqProducer $rabbitMqProducer;
private RedisProducer $redisProducer;
public function __construct(WallabagV2Import $wallabagImport, Config $craueConfig, RabbitMqProducer $rabbitMqProducer, RedisProducer $redisProducer)
{
$this->wallabagImport = $wallabagImport;
$this->craueConfig = $craueConfig;
$this->rabbitMqProducer = $rabbitMqProducer;
$this->redisProducer = $redisProducer;
}
/**
* @Route("/wallabag-v2", name="import_wallabag_v2")
*/
public function indexAction(Request $request)
public function indexAction(Request $request, TranslatorInterface $translator)
{
return parent::indexAction($request);
return parent::indexAction($request, $translator);
}
/**
@ -22,15 +38,13 @@ class WallabagV2Controller extends WallabagController
*/
protected function getImportService()
{
$service = $this->get(WallabagV2Import::class);
if ($this->get(Config::class)->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_wallabag_v2_producer'));
} elseif ($this->get(Config::class)->get('import_with_redis')) {
$service->setProducer($this->get('wallabag_import.producer.redis.wallabag_v2'));
if ($this->craueConfig->get('import_with_rabbitmq')) {
$this->wallabagImport->setProducer($this->rabbitMqProducer);
} elseif ($this->craueConfig->get('import_with_redis')) {
$this->wallabagImport->setProducer($this->redisProducer);
}
return $service;
return $this->wallabagImport;
}
/**