X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FCommand%2FImportCommand.php;h=28d0171599a97db540077ce89d21d82bded2bd15;hb=f17b89fadce0a8c2280fbe1518d66f20dddce59d;hp=1df38295fca33dc64a3b7d54303f0eb1a4b8ce96;hpb=59201088b4fc13fd361238396f630dabd9bd1990;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index 1df38295..28d01715 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: wallabag v1, v2, firefox or chrome', 'v1')
+ ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1')
->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
;
}
@@ -42,29 +42,36 @@ class ImportCommand extends ContainerAwareCommand
switch ($input->getOption('importer')) {
case 'v2':
- $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
+ $import = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
break;
case 'firefox':
- $wallabag = $this->getContainer()->get('wallabag_import.firefox.import');
+ $import = $this->getContainer()->get('wallabag_import.firefox.import');
break;
case 'chrome':
- $wallabag = $this->getContainer()->get('wallabag_import.chrome.import');
+ $import = $this->getContainer()->get('wallabag_import.chrome.import');
break;
- case 'v1':
- default:
- $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
+ case 'readability':
+ $import = $this->getContainer()->get('wallabag_import.readability.import');
+ break;
+ case 'instapaper':
+ $import = $this->getContainer()->get('wallabag_import.instapaper.import');
break;
+ case 'pinboard':
+ $import = $this->getContainer()->get('wallabag_import.pinboard.import');
+ break;
+ default:
+ $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
}
- $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');
}