X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=src%2FWallabag%2FImportBundle%2FCommand%2FImportCommand.php;h=13f3dcb994dbf54899356919fcb119f50ee78187;hb=5a619812ca3eb05a82a023ccdaee13501eb8d45f;hp=d1325338ddc8125f82dc3d0460b1515b0865859b;hpb=84795d015b3c7e1af48a3dda3cb33cf080b66e8f;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index d1325338..13f3dcb9 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, readability, firefox or chrome', 'v1')
->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
;
}
@@ -42,32 +42,38 @@ 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 'readability':
+ $import = $this->getContainer()->get('wallabag_import.readability.import');
+ break;
+ case 'instapaper':
+ $import = $this->getContainer()->get('wallabag_import.instapaper.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');
+ $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');
}