french translation & pocket

4 files changed, 52 insertions, 3 deletions

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
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 5dfd098c..1cc03d5b 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -22,6 +22,7 @@ class PocketImport implements ImportInterface
     private $consumerKey;
     private $skippedEntries = 0;
     private $importedEntries = 0;
+    private $markAsRead;
     protected $accessToken;
 
     public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig)
@@ -123,6 +124,27 @@ class PocketImport implements ImportInterface
         return true;
     }
 
+
+    /**
+     * Set whether articles must be all marked as read.
+     *
+     * @param bool $markAsRead
+     */
+    public function setMarkAsRead($markAsRead)
+    {
+        $this->markAsRead = $markAsRead;
+
+        return $this;
+    }
+
+    /**
+     * Get whether articles must be all marked as read.
+     */
+    public function getRead()
+    {
+        return $this->markAsRead;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -201,7 +223,7 @@ class PocketImport implements ImportInterface
             $entry = $this->contentProxy->updateEntry($entry, $url);
 
             // 0, 1, 2 - 1 if the item is archived - 2 if the item should be deleted
-            if ($pocketEntry['status'] == 1) {
+            if ($pocketEntry['status'] == 1 | $this->markAsRead) {
                 $entry->setArchived(true);
             }
 
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
index 1d773d3b..9ea698f9 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -128,6 +128,7 @@ class WallabagV1Import implements ImportInterface
      */
     public function setMarkAsRead($markAsRead)
     {
+        var_dump($markAsRead);
         $this->markAsRead = $markAsRead;
 
         return $this;
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 8aa5da97..3365fc6a 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -19,6 +19,13 @@
             <blockquote>{{ import.description|trans }}</blockquote>
             <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p>
             <form method="post" action="{{ path('import_pocket_auth') }}">
+            <div class="row">
+                <div class="input-field col s6 with-checkbox">
+                    <h6>{% trans %}Mark all as read ?{% endtrans %}</h6>
+                        {{ form_widget(form.read) }}
+                    <label for="form_read">{% trans %}Mark all imported entries as read{% endtrans %}</label>
+                </div>
+            </div>
                 <button class="btn waves-effect waves-light" type="submit" name="action">
                     {% trans %}Connect to Pocket and import data{% endtrans %}
                 </button>