Tags were not imported in wallabag v2 import

Also, simplify exportAs matching format

src/Wallabag/CoreBundle/Helper/EntriesExport.php

@@ -81,27 +81,9 @@ class EntriesExport
      */
     public function exportAs($format)
     {
-        switch ($format) {
-            case 'epub':
-                return $this->produceEpub();
-
-            case 'mobi':
-                return $this->produceMobi();
-
-            case 'pdf':
-                return $this->producePDF();
-
-            case 'csv':
-                return $this->produceCSV();
-
-            case 'json':
-                return $this->produceJSON();
-
-            case 'xml':
-                return $this->produceXML();
-
-            case 'txt':
-                return $this->produceTXT();
+        $functionName = 'produce'.ucfirst($format);
+        if (method_exists($this, $functionName)) {
+            return $this->$functionName();
         }
 
         throw new \InvalidArgumentException(sprintf('The format "%s" is not yet supported.', $format));
@@ -242,7 +224,7 @@ class EntriesExport
     /**
      * Use TCPDF to dump a .pdf file.
      */
-    private function producePDF()
+    private function producePdf()
     {
         $pdf = new \TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
 
@@ -296,7 +278,7 @@ class EntriesExport
     /**
      * Inspired from CsvFileDumper.
      */
-    private function produceCSV()
+    private function produceCsv()
     {
         $delimiter = ';';
         $enclosure = '"';
@@ -336,7 +318,7 @@ class EntriesExport
         );
     }
 
-    private function produceJSON()
+    private function produceJson()
     {
         return Response::create(
             $this->prepareSerializingContent('json'),
@@ -349,7 +331,7 @@ class EntriesExport
         );
     }
 
-    private function produceXML()
+    private function produceXml()
     {
         return Response::create(
             $this->prepareSerializingContent('xml'),
@@ -362,7 +344,7 @@ class EntriesExport
         );
     }
 
-    private function produceTXT()
+    private function produceTxt()
     {
         $content = '';
         $bar = str_repeat('=', 100);

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;
 

src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php

@@ -53,6 +53,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
         $this->assertEmpty($content->getMimetype());
         $this->assertEmpty($content->getPreviewPicture());
         $this->assertEmpty($content->getLanguage());
+        $this->assertEquals(0, count($content->getTags()));
 
         $content = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
@@ -65,6 +66,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
         $this->assertNotEmpty($content->getMimetype());
         $this->assertNotEmpty($content->getPreviewPicture());
         $this->assertNotEmpty($content->getLanguage());
+        $this->assertEquals(2, count($content->getTags()));
     }
 
     public function testImportWallabagWithEmptyFile()

src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php

@@ -2,9 +2,9 @@
 
 namespace Wallabag\ImportBundle\Tests\Import;
 
+use Wallabag\ImportBundle\Import\WallabagV1Import;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\ImportBundle\Import\WallabagV1Import;
 use Monolog\Logger;
 use Monolog\Handler\TestHandler;
 

src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php

@@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Tests\Import;
 
 use Wallabag\ImportBundle\Import\WallabagV2Import;
 use Wallabag\UserBundle\Entity\User;
+use Wallabag\CoreBundle\Entity\Entry;
 use Monolog\Logger;
 use Monolog\Handler\TestHandler;
 
@@ -66,6 +67,11 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
             ->method('getRepository')
             ->willReturn($entryRepo);
 
+        $this->contentProxy
+            ->expects($this->exactly(2))
+            ->method('updateEntry')
+            ->willReturn(new Entry($this->user));
+
         $res = $wallabagV2Import->import();
 
         $this->assertTrue($res);
@@ -90,6 +96,11 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
             ->method('getRepository')
             ->willReturn($entryRepo);
 
+        $this->contentProxy
+            ->expects($this->exactly(2))
+            ->method('updateEntry')
+            ->willReturn(new Entry($this->user));
+
         // check that every entry persisted are archived
         $this->em
             ->expects($this->any())