Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Import / WallabagV2Import.php

diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index 7125eabc1681bff429ce543994feac6e325e2572..3e085ecff6461b8a36fdc6ebd34225e5835c0623 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -2,9 +2,7 @@
 
 namespace Wallabag\ImportBundle\Import;
 
-use Wallabag\CoreBundle\Entity\Entry;
-
-class WallabagV2Import extends WallabagV1Import implements ImportInterface
+class WallabagV2Import extends WallabagImport
 {
     /**
      * {@inheritdoc}
@@ -27,55 +25,29 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.';
+        return 'import.wallabag_v2.description';
     }
 
     /**
-     * @param $entries
+     * {@inheritdoc}
      */
-    protected function parseEntries($entries)
+    protected function prepareEntry($entry = [])
     {
-        $i = 1;
-
-        foreach ($entries as $importedEntry) {
-            $existingEntry = $this->em
-                ->getRepository('WallabagCoreBundle:Entry')
-                ->findByUrlAndUserId($importedEntry['url'], $this->user->getId());
-
-            if (false !== $existingEntry) {
-                ++$this->skippedEntries;
-                continue;
-            }
-
-            // @see ContentProxy->updateEntry
-            $entry = new Entry($this->user);
-            $entry->setUrl($importedEntry['url']);
-            $entry->setTitle($importedEntry['title']);
-            $entry->setArchived($importedEntry['is_archived']);
-            $entry->setStarred($importedEntry['is_starred']);
-            $entry->setContent($importedEntry['content']);
-            $entry->setReadingTime($importedEntry['reading_time']);
-            $entry->setDomainName($importedEntry['domain_name']);
-            if (isset($importedEntry['mimetype'])) {
-                $entry->setMimetype($importedEntry['mimetype']);
-            }
-            if (isset($importedEntry['language'])) {
-                $entry->setLanguage($importedEntry['language']);
-            }
-            if (isset($importedEntry['preview_picture'])) {
-                $entry->setPreviewPicture($importedEntry['preview_picture']);
-            }
-
-            $this->em->persist($entry);
-            ++$this->importedEntries;
+        return [
+            'html' => $entry['content'],
+            'content_type' => $entry['mimetype'],
+            'is_archived' => (bool) ($entry['is_archived'] || $this->markAsRead),
+            'is_starred' => (bool) $entry['is_starred'],
+        ] + $entry;
+    }
 
-            // flush every 20 entries
-            if (($i % 20) === 0) {
-                $this->em->flush();
-            }
-            ++$i;
-        }
+    /**
+     * {@inheritdoc}
+     */
+    protected function setEntryAsRead(array $importedEntry)
+    {
+        $importedEntry['is_archived'] = 1;
 
-        $this->em->flush();
+        return $importedEntry;
     }
 }