X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=src%2FWallabag%2FImportBundle%2FImport%2FPocketImport.php;h=fe39d33fb40082f863cd9a3c9a1073a9963f2371;hb=ebf5e5087d2f79ece42a660ee7bddaa3ff3ebe1e;hp=06a318136d8bc5695eaa535f1b8acb6fbf9fb0d4;hpb=02f64895728fe9aee2c696a627e0bbe27a24faf2;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 06a31813..fe39d33f 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -14,8 +14,6 @@ class PocketImport extends AbstractImport
 {
     private $client;
     private $consumerKey;
-    private $skippedEntries = 0;
-    private $importedEntries = 0;
     private $accessToken;
 
     const NB_ELEMENTS = 5000;
@@ -29,7 +27,7 @@ class PocketImport extends AbstractImport
     }
 
     /**
-     * Only used for test purpose
+     * Only used for test purpose.
      *
      * @return string
      */
@@ -195,6 +193,11 @@ class PocketImport extends AbstractImport
         $this->client = $client;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @see https://getpocket.com/developer/docs/v3/retrieve
+     */
     public function parseEntry(array $importedEntry)
     {
         $url = isset($importedEntry['resolved_url']) && $importedEntry['resolved_url'] != '' ? $importedEntry['resolved_url'] : $importedEntry['given_url'];
@@ -251,6 +254,10 @@ class PocketImport extends AbstractImport
             );
         }
 
+        if (!empty($importedEntry['time_added'])) {
+            $entry->setCreatedAt((new \DateTime())->setTimestamp($importedEntry['time_added']));
+        }
+
         $this->em->persist($entry);
         ++$this->importedEntries;
 
@@ -258,24 +265,12 @@ class PocketImport extends AbstractImport
     }
 
     /**
-     * Faster parse entries for Producer.
-     * We don't care to make check at this time. They'll be done by the consumer.
-     *
-     * @param array $entries
+     * {@inheritdoc}
      */
-    public function parseEntriesForProducer($entries)
+    protected function setEntryAsRead(array $importedEntry)
     {
-        foreach ($entries as $importedEntry) {
-            // set userId for the producer (it won't know which user is connected)
-            $importedEntry['userId'] = $this->user->getId();
-
-            if ($this->markAsRead) {
-                $importedEntry['status'] = 1;
-            }
+        $importedEntry['status'] = '1';
 
-            ++$this->importedEntries;
-
-            $this->producer->publish(json_encode($importedEntry));
-        }
+        return $importedEntry;
     }
 }