Merge pull request #1712 from wallabag/v2-contributing

[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 02327312515fcc4a58f38d2f10c1f0f8b9137f45..05bdb4014239bc1535619e0aa1f76fd016ce11aa 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -15,7 +15,7 @@ class WallabagV1Import implements ImportInterface
     protected $user;
     protected $em;
     protected $logger;
-    private $contentProxy;
+    protected $contentProxy;
     protected $skippedEntries = 0;
     protected $importedEntries = 0;
     protected $filepath;
@@ -126,10 +126,9 @@ class WallabagV1Import implements ImportInterface
     protected function parseEntries($entries)
     {
         $i = 1;
-        /*
-         * Untitled in all languages from v1. This should never have been translated
-         */
-        $untitled = array('Untitled', 'Sans titre', 'podle nadpisu', 'Sin título', 'با عنوان', 'per titolo', 'Sem título', 'Без названия', 'po naslovu', 'Без назви');
+
+        //Untitled in all languages from v1. This should never have been translated
+        $untitled = array('Untitled', 'Sans titre', 'podle nadpisu', 'Sin título', 'با عنوان', 'per titolo', 'Sem título', 'Без названия', 'po naslovu', 'Без назви', 'No title found', '');
 
         foreach ($entries as $importedEntry) {
             $existingEntry = $this->em
@@ -144,14 +143,23 @@ class WallabagV1Import implements ImportInterface
             // @see ContentProxy->updateEntry
             $entry = new Entry($this->user);
             $entry->setUrl($importedEntry['url']);
+
             if (in_array($importedEntry['title'], $untitled)) {
-                $entry = $this->contentProxy->updateEntry($entry, $entry->getUrl());
+                $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));
             }
+
+            if (array_key_exists('tags', $importedEntry) && $importedEntry['tags'] != '') {
+                $this->contentProxy->assignTagsToEntry(
+                    $entry,
+                    $importedEntry['tags']
+                );
+            }
+
             $entry->setArchived($importedEntry['is_read']);
             $entry->setStarred($importedEntry['is_fav']);