Merge pull request #2519 from Jibec/master

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Command / ImportCommand.php

diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index 537dffc207f480bf0112a2b249a457b6e5e7c673..d1325338ddc8125f82dc3d0460b1515b0865859b 100644 (file)
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -17,7 +17,7 @@ class ImportCommand extends ContainerAwareCommand
             ->setDescription('Import entries from a JSON export from a wallabag v1 instance')
             ->addArgument('userId', InputArgument::REQUIRED, 'User ID to populate')
             ->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file')
-            ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: wallabag v1, v2 or browser', 'v1')
+            ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: wallabag v1, v2, firefox or chrome', 'v1')
             ->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
         ;
     }
@@ -44,12 +44,16 @@ class ImportCommand extends ContainerAwareCommand
             case 'v2':
                 $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
                 break;
-            case 'v1':
-                $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
+            case 'firefox':
+                $wallabag = $this->getContainer()->get('wallabag_import.firefox.import');
                 break;
-            case 'browser':
-                $wallabag = $this->getContainer()->get('wallabag_import.browser.import');
+            case 'chrome':
+                $wallabag = $this->getContainer()->get('wallabag_import.chrome.import');
                 break;
+            case 'instapaper':
+                $wallabag = $this->getContainer()->get('wallabag_import.instapaper.import');
+                break;
+            case 'v1':
             default:
                 $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
                 break;