From fe8b37c137adbe036f58616c15dbcffd07dd2cd4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 12 Feb 2016 15:59:13 +0100 Subject: Mark all imported articles as read --- src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php | 2 ++ src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/Wallabag/ImportBundle/Controller') diff --git a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php index 35fe620f..8b27144b 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php @@ -21,12 +21,14 @@ class WallabagV1Controller extends Controller if ($form->isValid()) { $file = $form->get('file')->getData(); + $markAsRead = $form->get('mark_as_read')->getData(); $name = $this->getUser()->getId().'.json'; if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { $res = $wallabag ->setUser($this->getUser()) ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) + ->setMarkAsRead($markAsRead) ->import(); $message = 'Import failed, please try again.'; diff --git a/src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php b/src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php index 2e6225f2..6dcd204a 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php @@ -21,12 +21,14 @@ class WallabagV2Controller extends Controller if ($form->isValid()) { $file = $form->get('file')->getData(); + $markAsRead = $form->get('mark_as_read')->getData(); $name = $this->getUser()->getId().'.json'; if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { $res = $wallabag ->setUser($this->getUser()) ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) + ->setMarkAsRead($markAsRead) ->import(); $message = 'Import failed, please try again.'; -- cgit v1.2.3 From c10fcb3bbbd4ef14edd9a862ee18c895d92e30ae Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 13 Feb 2016 14:32:16 +0100 Subject: french translation & pocket --- .../ImportBundle/Controller/PocketController.php | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/ImportBundle/Controller') diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 1c1b4fa8..bfd9fc5b 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -5,6 +5,10 @@ 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 { @@ -13,21 +17,33 @@ class PocketController extends Controller */ public function indexAction() { + $pocket = $this->get('wallabag_import.pocket.import'); + $form = $this->createFormBuilder($pocket) + ->add('read', CheckboxType::class, array( + 'label' => 'Mark all as read', + 'required' => false, + )) + ->getForm(); + ; + return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ 'import' => $this->get('wallabag_import.pocket.import'), 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, + 'form' => $form->createView(), ]); } /** * @Route("/pocket/auth", name="import_pocket_auth") */ - public function authAction() + public function authAction(Request $request) { $requestToken = $this->get('wallabag_import.pocket.import') ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL)); $this->get('session')->set('import.pocket.code', $requestToken); + $markAsRead = $request->request->get('form')['read']; + $this->get('session')->set('read', $markAsRead); return $this->redirect( 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL), @@ -42,6 +58,7 @@ class PocketController extends Controller { $message = 'Import failed, please try again.'; $pocket = $this->get('wallabag_import.pocket.import'); + $markAsRead = $this->get('session')->get('read'); // something bad happend on pocket side if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) { @@ -53,11 +70,13 @@ class PocketController extends Controller return $this->redirect($this->generateUrl('import_pocket')); } - if (true === $pocket->import()) { + if (true === $pocket->setMarkAsRead($markAsRead)->import()) { $summary = $pocket->getSummary(); $message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.'; } + $this->get('session')->remove('read'); + $this->get('session')->getFlashBag()->add( 'notice', $message -- cgit v1.2.3 From c32ae320fec4135f5b32d57ef88349317a3b1f3f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 13 Feb 2016 16:20:00 +0100 Subject: cs & tests for wllbg v1 import --- src/Wallabag/ImportBundle/Controller/PocketController.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/Wallabag/ImportBundle/Controller') diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index bfd9fc5b..ef0407e6 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -5,11 +5,9 @@ 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 { /** @@ -24,7 +22,6 @@ class PocketController extends Controller 'required' => false, )) ->getForm(); - ; return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ 'import' => $this->get('wallabag_import.pocket.import'), -- cgit v1.2.3 From 79d0e38e7ff975b2e0306d3dd96f57509fd84aef Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 4 Mar 2016 10:04:51 +0100 Subject: Adding test Reformat json file (thanks pro.jsonlint.com) --- src/Wallabag/ImportBundle/Controller/PocketController.php | 12 +++++------- .../ImportBundle/Controller/WallabagV1Controller.php | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/ImportBundle/Controller') diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index ef0407e6..c88e115e 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -18,9 +18,9 @@ class PocketController extends Controller $pocket = $this->get('wallabag_import.pocket.import'); $form = $this->createFormBuilder($pocket) ->add('read', CheckboxType::class, array( - 'label' => 'Mark all as read', - 'required' => false, - )) + 'label' => 'Mark all as read', + 'required' => false, + )) ->getForm(); return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ @@ -39,8 +39,7 @@ class PocketController extends Controller ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL)); $this->get('session')->set('import.pocket.code', $requestToken); - $markAsRead = $request->request->get('form')['read']; - $this->get('session')->set('read', $markAsRead); + $this->get('session')->set('read', $request->request->get('form')['read']); return $this->redirect( 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL), @@ -56,6 +55,7 @@ class PocketController extends Controller $message = 'Import failed, please try again.'; $pocket = $this->get('wallabag_import.pocket.import'); $markAsRead = $this->get('session')->get('read'); + $this->get('session')->remove('read'); // something bad happend on pocket side if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) { @@ -72,8 +72,6 @@ class PocketController extends Controller $message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.'; } - $this->get('session')->remove('read'); - $this->get('session')->getFlashBag()->add( 'notice', $message diff --git a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php index 8b27144b..154a0769 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php @@ -32,6 +32,7 @@ class WallabagV1Controller extends Controller ->import(); $message = 'Import failed, please try again.'; + if (true === $res) { $summary = $wallabag->getSummary(); $message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.'; -- cgit v1.2.3