Tags were not imported in wallabag v2 import

[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 0a32864eb04ae16a7efaa0c188fe860343f6d3e3..b31d63a3356f2cbed18870396ce8e3280a0711d4 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -47,25 +47,29 @@ 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'] || $this->markAsRead);
-            $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']);
+            $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']);
+
             $this->em->persist($entry);
             ++$this->importedEntries;