X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FImportBundle%2FImport%2FWallabagV2Import.php;h=b31d63a3356f2cbed18870396ce8e3280a0711d4;hb=8f336fda649c064cabfa692793334067ece780f9;hp=979c671e991512c460f4e6603fba889a8457e3d7;hpb=e008c037f53324b931f027483f9f1053171109c5;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index 979c671e..b31d63a3 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return 'This importer will import all your wallabag v2 articles. On the export sidebar, click on "JSON". You will have a "Unread articles.json" file.';
+        return 'import.wallabag_v2.description';
     }
 
     /**
@@ -47,18 +47,28 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
                 continue;
             }
 
-            // @see ContentProxy->updateEntry
-            $entry = new Entry($this->user);
-            $entry->setUrl($importedEntry['url']);
-            $entry->setTitle($importedEntry['title']);
-            $entry->setArchived($importedEntry['is_archived']);
+            $importedEntry['html'] = $importedEntry['content'];
+            $importedEntry['content_type'] = $importedEntry['mimetype'];
+
+            $entry = $this->contentProxy->updateEntry(
+                new Entry($this->user),
+                $importedEntry['url'],
+                $importedEntry
+            );
+
+            if (array_key_exists('tags', $importedEntry) && !empty($importedEntry['tags'])) {
+                $this->contentProxy->assignTagsToEntry(
+                    $entry,
+                    $importedEntry['tags']
+                );
+            }
+
+            if (isset($importedEntry['preview_picture'])) {
+                $entry->setPreviewPicture($importedEntry['preview_picture']);
+            }
+
+            $entry->setArchived($importedEntry['is_archived'] || $this->markAsRead);
             $entry->setStarred($importedEntry['is_starred']);
-            $entry->setContent($importedEntry['content']);
-            $entry->setReadingTime($importedEntry['reading_time']);
-            $entry->setDomainName($importedEntry['domain_name']);
-            $entry->setMimetype($importedEntry['mimetype']);
-            $entry->setLanguage($importedEntry['language']);
-            $entry->setPreviewPicture($importedEntry['preview_picture']);
 
             $this->em->persist($entry);
             ++$this->importedEntries;