Move assignTagsToEntry in ContentProxy helper

[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 7b0126748e28d4afe8d5c88717241bea25d6fb63..05bdb4014239bc1535619e0aa1f76fd016ce11aa 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -8,20 +8,23 @@ 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
 {
-    private $user;
-    private $em;
-    private $logger;
-    private $skippedEntries = 0;
-    private $importedEntries = 0;
-    private $filepath;
-
-    public function __construct(EntityManager $em)
+    protected $user;
+    protected $em;
+    protected $logger;
+    protected $contentProxy;
+    protected $skippedEntries = 0;
+    protected $importedEntries = 0;
+    protected $filepath;
+
+    public function __construct(EntityManager $em, ContentProxy $contentProxy)
     {
         $this->em = $em;
         $this->logger = new NullLogger();
+        $this->contentProxy = $contentProxy;
     }
 
     public function setLogger(LoggerInterface $logger)
@@ -47,7 +50,15 @@ class WallabagV1Import implements ImportInterface
      */
     public function getName()
     {
-        return 'Wallabag v1';
+        return 'wallabag v1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUrl()
+    {
+        return 'import_wallabag_v1';
     }
 
     /**
@@ -55,7 +66,7 @@ class WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return 'This importer will import all your wallabag v1 articles.';
+        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.';
     }
 
     /**
@@ -64,18 +75,24 @@ class WallabagV1Import implements ImportInterface
     public function import()
     {
         if (!$this->user) {
-            $this->logger->error('WallabagV1Import: user is not defined');
+            $this->logger->error('WallabagImport: user is not defined');
 
             return false;
         }
 
         if (!file_exists($this->filepath) || !is_readable($this->filepath)) {
-            $this->logger->error('WallabagV1Import: unable to read file', array('filepath' => $this->filepath));
+            $this->logger->error('WallabagImport: unable to read file', array('filepath' => $this->filepath));
+
+            return false;
+        }
+
+        $data = json_decode(file_get_contents($this->filepath), true);
 
+        if (empty($data)) {
             return false;
         }
 
-        $this->parseEntries(json_decode(file_get_contents($this->filepath), true));
+        $this->parseEntries($data);
 
         return true;
     }
@@ -106,12 +123,17 @@ class WallabagV1Import implements ImportInterface
     /**
      * @param $entries
      */
-    private function parseEntries($entries)
+    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', 'Без назви', 'No title found', '');
+
         foreach ($entries as $importedEntry) {
             $existingEntry = $this->em
                 ->getRepository('WallabagCoreBundle:Entry')
-                ->existByUrlAndUserId($importedEntry['url'], $this->user->getId());
+                ->findByUrlAndUserId($importedEntry['url'], $this->user->getId());
 
             if (false !== $existingEntry) {
                 ++$this->skippedEntries;
@@ -121,15 +143,34 @@ class WallabagV1Import implements ImportInterface
             // @see ContentProxy->updateEntry
             $entry = new Entry($this->user);
             $entry->setUrl($importedEntry['url']);
-            $entry->setTitle($importedEntry['title']);
+
+            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));
+            }
+
+            if (array_key_exists('tags', $importedEntry) && $importedEntry['tags'] != '') {
+                $this->contentProxy->assignTagsToEntry(
+                    $entry,
+                    $importedEntry['tags']
+                );
+            }
+
             $entry->setArchived($importedEntry['is_read']);
             $entry->setStarred($importedEntry['is_fav']);
-            $entry->setContent($importedEntry['content']);
-            $entry->setReadingTime(Utils::getReadingTime($importedEntry['content']));
-            $entry->setDomainName(parse_url($importedEntry['url'], PHP_URL_HOST));
 
             $this->em->persist($entry);
             ++$this->importedEntries;
+
+            // flush every 20 entries
+            if (($i % 20) === 0) {
+                $this->em->flush();
+            }
+            ++$i;
         }
 
         $this->em->flush();