X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FImport%2FPocketImport.php;h=e5c86f07b5d47d9b86258bdba4185bac003dbdfc;hb=7ec2897ee0ad190dcb9f77032d785f2f9661b754;hp=81af8e5758a9fb0e73abe976f668c62d759288be;hpb=d51b38ed309c9aead938e8c8963c05c6d82b4ec2;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 81af8e57..e5c86f07 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -5,7 +5,9 @@ namespace Wallabag\ImportBundle\Import;
 use Doctrine\ORM\EntityManager;
 use GuzzleHttp\Client;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Tools\Utils;
 
 class PocketImport implements ImportInterface
@@ -14,8 +16,10 @@ class PocketImport implements ImportInterface
     private $session;
     private $em;
     private $consumerKey;
+    private $skippedEntries = 0;
+    private $importedEntries = 0;
 
-    public function __construct($tokenStorage, Session $session, EntityManager $em, $consumerKey)
+    public function __construct(TokenStorageInterface $tokenStorage, Session $session, EntityManager $em, $consumerKey)
     {
         $this->user = $tokenStorage->getToken()->getUser();
         $this->session = $session;
@@ -23,65 +27,28 @@ class PocketImport implements ImportInterface
         $this->consumerKey = $consumerKey;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getName()
     {
         return 'Pocket';
     }
 
-    public function getDescription()
-    {
-        return 'This importer will import all your <a href="https://getpocket.com">Pocket</a> data.';
-    }
-
     /**
-     * Create a new Client.
-     *
-     * @return Client
+     * {@inheritdoc}
      */
-    private function createClient()
+    public function getDescription()
     {
-        return new Client([
-            'defaults' => [
-                'headers' => [
-                    'content-type' => 'application/json',
-                    'X-Accept' => 'application/json',
-                ],
-            ],
-        ]);
+        return 'This importer will import all your <a href="https://getpocket.com">Pocket</a> data.';
     }
 
     /**
-     * @param $entries
+     * {@inheritdoc}
      */
-    private function parsePocketEntries($entries)
-    {
-        foreach ($entries as $entry) {
-            $newEntry = new Entry($this->user);
-            $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']));
-            }
-
-            $this->em->persist($newEntry);
-        }
-
-        $this->em->flush();
-    }
-
     public function oAuthRequest($redirectUri, $callbackUri)
     {
-        $client = $this->createClient();
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
+        $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
@@ -90,7 +57,7 @@ class PocketImport implements ImportInterface
             ]
         );
 
-        $response = $client->send($request);
+        $response = $this->client->send($request);
         $values = $response->json();
 
         // store code in session for callback method
@@ -99,11 +66,12 @@ class PocketImport implements ImportInterface
         return 'https://getpocket.com/auth/authorize?request_token='.$values['code'].'&redirect_uri='.$callbackUri;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function oAuthAuthorize()
     {
-        $client = $this->createClient();
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
+        $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
@@ -112,33 +80,152 @@ class PocketImport implements ImportInterface
             ]
         );
 
-        $response = $client->send($request);
+        $response = $this->client->send($request);
 
         return $response->json()['access_token'];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function import($accessToken)
     {
-        $client = $this->createClient();
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/get',
+        $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/get',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
                     'access_token' => $accessToken,
                     'detailType' => 'complete',
+                    'state' => 'all',
+                    'sort' => 'oldest',
                 ]),
             ]
         );
 
-        $response = $client->send($request);
+        $response = $this->client->send($request);
         $entries = $response->json();
 
         $this->parsePocketEntries($entries['list']);
 
         $this->session->getFlashBag()->add(
             'notice',
-            count($entries['list']).' entries imported'
+            $this->importedEntries.' entries imported, '.$this->skippedEntries.' already saved.'
         );
     }
+
+    /**
+     * Set the Guzzle client.
+     *
+     * @param Client $client
+     */
+    public function setClient(Client $client)
+    {
+        $this->client = $client;
+    }
+
+    /**
+     * Returns the good title for current entry.
+     *
+     * @param $pocketEntry
+     *
+     * @return string
+     */
+    private function guessTitle($pocketEntry)
+    {
+        if (isset($pocketEntry['resolved_title']) && $pocketEntry['resolved_title'] != '') {
+            return $pocketEntry['resolved_title'];
+        } elseif (isset($pocketEntry['given_title']) && $pocketEntry['given_title'] != '') {
+            return $pocketEntry['given_title'];
+        }
+
+        return 'Untitled';
+    }
+
+    /**
+     * Returns the good URL for current entry.
+     *
+     * @param $pocketEntry
+     *
+     * @return string
+     */
+    private function guessURL($pocketEntry)
+    {
+        if (isset($pocketEntry['resolved_url']) && $pocketEntry['resolved_url'] != '') {
+            return $pocketEntry['resolved_url'];
+        }
+
+        return $pocketEntry['given_url'];
+    }
+
+    private function assignTagsToEntry(Entry $entry, $tags)
+    {
+        foreach ($tags as $tag) {
+            $label = trim($tag['tag']);
+            $tagEntity = $this->em
+                ->getRepository('WallabagCoreBundle:Tag')
+                ->findOneByLabelAndUserId($label, $this->user->getId());
+
+            if (is_object($tagEntity)) {
+                $entry->addTag($tagEntity);
+            } else {
+                $newTag = new Tag($this->user);
+                $newTag->setLabel($label);
+                $entry->addTag($newTag);
+            }
+            $this->em->flush();
+        }
+    }
+
+    /**
+     * @param $entries
+     */
+    private function parsePocketEntries($entries)
+    {
+        foreach ($entries as $pocketEntry) {
+            $entry = new Entry($this->user);
+            $url = $this->guessURL($pocketEntry);
+
+            $existingEntry = $this->em
+                ->getRepository('WallabagCoreBundle:Entry')
+                ->existByUrlAndUserId($url, $this->user->getId());
+
+            if (false !== $existingEntry) {
+                ++$this->skippedEntries;
+                continue;
+            }
+
+            $entry->setUrl($url);
+            $entry->setDomainName(parse_url($url, PHP_URL_HOST));
+
+            if ($pocketEntry['status'] == 1) {
+                $entry->setArchived(true);
+            }
+            if ($pocketEntry['favorite'] == 1) {
+                $entry->setStarred(true);
+            }
+
+            $entry->setTitle($this->guessTitle($pocketEntry));
+
+            if (isset($pocketEntry['excerpt'])) {
+                $entry->setContent($pocketEntry['excerpt']);
+            }
+
+            if (isset($pocketEntry['has_image']) && $pocketEntry['has_image'] > 0) {
+                $entry->setPreviewPicture($pocketEntry['image']['src']);
+            }
+
+            if (isset($pocketEntry['word_count'])) {
+                $entry->setReadingTime(Utils::convertWordsToMinutes($pocketEntry['word_count']));
+            }
+
+            if (!empty($pocketEntry['tags'])) {
+                $this->assignTagsToEntry($entry, $pocketEntry['tags']);
+            }
+
+            $this->em->persist($entry);
+            ++$this->importedEntries;
+        }
+
+        $this->em->flush();
+    }
 }