Merge pull request #1805 from wallabag/v2-assign-comma-tags

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

diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
index 1d773d3bb58e2094ac057c490121c5dc9883479d..82160bae1e3ffe55b65a59a89a28ff63bf006551 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -7,7 +7,6 @@ use Psr\Log\NullLogger;
 use Doctrine\ORM\EntityManager;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\UserBundle\Entity\User;
-use Wallabag\CoreBundle\Tools\Utils;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 
 class WallabagV1Import implements ImportInterface
@@ -67,7 +66,7 @@ class WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.';
+        return 'import.wallabag_v1.description';
     }
 
     /**
@@ -153,19 +152,25 @@ class WallabagV1Import implements ImportInterface
                 continue;
             }
 
-            // @see ContentProxy->updateEntry
-            $entry = new Entry($this->user);
-            $entry->setUrl($importedEntry['url']);
+            $data = [
+                'title' => $importedEntry['title'],
+                'html' => $importedEntry['content'],
+                'url' => $importedEntry['url'],
+                'content_type' => '',
+                'language' => '',
+            ];
 
+            // force content to be refreshed in case on bad fetch in the v1 installation
             if (in_array($importedEntry['title'], $untitled)) {
-                $entry = $this->contentProxy->updateEntry($entry, $importedEntry['url']);
-            } else {
-                $entry->setContent($importedEntry['content']);
-                $entry->setTitle($importedEntry['title']);
-                $entry->setReadingTime(Utils::getReadingTime($importedEntry['content']));
-                $entry->setDomainName(parse_url($importedEntry['url'], PHP_URL_HOST));
+                $data = [];
             }
 
+            $entry = $this->contentProxy->updateEntry(
+                new Entry($this->user),
+                $importedEntry['url'],
+                $data
+            );
+
             if (array_key_exists('tags', $importedEntry) && $importedEntry['tags'] != '') {
                 $this->contentProxy->assignTagsToEntry(
                     $entry,