X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FCommand%2FImportCommand.php;h=2f7a906e38e9752bf3ec39038328445bd72a0c1f;hb=da4136557963018287cae61226e9006c3c741747;hp=20ecc6e1893a09292df62209037e6f9e9ed709a4;hpb=ebf5e5087d2f79ece42a660ee7bddaa3ff3ebe1e;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index 20ecc6e1..2f7a906e 100644
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -14,10 +14,10 @@ class ImportCommand extends ContainerAwareCommand
{
$this
->setName('wallabag:import')
- ->setDescription('Import entries from a JSON export from a wallabag v1 instance')
+ ->setDescription('Import entries from a JSON export')
->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: v1 or v2', 'v1')
+ ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, readability, firefox or chrome', 'v1')
->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
;
}
@@ -40,21 +40,37 @@ class ImportCommand extends ContainerAwareCommand
throw new Exception(sprintf('User with id "%s" not found', $input->getArgument('userId')));
}
- $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
-
- if ('v2' === $input->getOption('importer')) {
- $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
+ switch ($input->getOption('importer')) {
+ case 'v2':
+ $import = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
+ break;
+ case 'firefox':
+ $import = $this->getContainer()->get('wallabag_import.firefox.import');
+ break;
+ case 'chrome':
+ $import = $this->getContainer()->get('wallabag_import.chrome.import');
+ break;
+ case 'readability':
+ $import = $this->getContainer()->get('wallabag_import.readability.import');
+ break;
+ case 'instapaper':
+ $import = $this->getContainer()->get('wallabag_import.instapaper.import');
+ break;
+ case 'v1':
+ default:
+ $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
+ break;
}
- $wallabag->setMarkAsRead($input->getOption('markAsRead'));
- $wallabag->setUser($user);
+ $import->setMarkAsRead($input->getOption('markAsRead'));
+ $import->setUser($user);
- $res = $wallabag
+ $res = $import
->setFilepath($input->getArgument('filepath'))
->import();
if (true === $res) {
- $summary = $wallabag->getSummary();
+ $summary = $import->getSummary();
$output->writeln(''.$summary['imported'].' imported');
$output->writeln(''.$summary['skipped'].' already saved');
}