X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FCommand%2FImportCommand.php;h=5f1ab0af018cdf5620ab87f754cf4f24388dbc62;hb=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;hp=a4aa8531183fae5fdbcca187fa29ec79be419e03;hpb=f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index a4aa8531..5f1ab0af 100644
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -5,6 +5,7 @@ namespace Wallabag\ImportBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Config\Definition\Exception\Exception;
use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -14,11 +15,13 @@ class ImportCommand extends ContainerAwareCommand
{
$this
->setName('wallabag:import')
- ->setDescription('Import entries from a JSON export from a wallabag v1 instance')
- ->addArgument('userId', InputArgument::REQUIRED, 'User ID to populate')
+ ->setDescription('Import entries from a JSON export')
+ ->addArgument('username', InputArgument::REQUIRED, 'User 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('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
+ ->addOption('importer', null, InputOption::VALUE_OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1')
+ ->addOption('markAsRead', null, InputOption::VALUE_OPTIONAL, 'Mark all entries as read', false)
+ ->addOption('useUserId', null, InputOption::VALUE_NONE, 'Use user id instead of username to find account')
+ ->addOption('disableContentUpdate', null, InputOption::VALUE_NONE, 'Disable fetching updated content from URL')
;
}
@@ -26,31 +29,57 @@ class ImportCommand extends ContainerAwareCommand
{
$output->writeln('Start : '.(new \DateTime())->format('d-m-Y G:i:s').' ---');
+ if (!file_exists($input->getArgument('filepath'))) {
+ throw new Exception(sprintf('File "%s" not found', $input->getArgument('filepath')));
+ }
+
$em = $this->getContainer()->get('doctrine')->getManager();
// Turning off doctrine default logs queries for saving memory
$em->getConnection()->getConfiguration()->setSQLLogger(null);
- $user = $em->getRepository('WallabagUserBundle:User')->findOneById($input->getArgument('userId'));
+ if ($input->getOption('useUserId')) {
+ $user = $em->getRepository('WallabagUserBundle:User')->findOneById($input->getArgument('username'));
+ } else {
+ $user = $em->getRepository('WallabagUserBundle:User')->findOneByUsername($input->getArgument('username'));
+ }
if (!is_object($user)) {
- throw new Exception(sprintf('User with id "%s" not found', $input->getArgument('userId')));
+ throw new Exception(sprintf('User "%s" not found', $input->getArgument('username')));
}
- $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 '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'));
+ $import->setMarkAsRead($input->getOption('markAsRead'));
+ $import->setDisableContentUpdate($input->getOption('disableContentUpdate'));
+ $import->setUser($user);
- $res = $wallabag
- ->setUser($user)
+ $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');
}