X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FCommand%2FImportCommand.php;h=f9ffe994db821fafb815b546871d4f1eb04ae034;hb=refs%2Fpull%2F3816%2Fhead;hp=bca800e6cf23bb5d614c7396f959f0b6d7d7b67c;hpb=d0e9b3d640acce49068d1a2c5603b92c1bda363e;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index bca800e6..f9ffe994 100644
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -5,8 +5,8 @@ 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\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class ImportCommand extends ContainerAwareCommand
@@ -18,15 +18,16 @@ class ImportCommand extends ContainerAwareCommand
->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, v2, instapaper, pinboard, readability, firefox or chrome', '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')
;
}
protected function execute(InputInterface $input, OutputInterface $output)
{
- $output->writeln('Start : '.(new \DateTime())->format('d-m-Y G:i:s').' ---');
+ $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')));
@@ -42,7 +43,7 @@ class ImportCommand extends ContainerAwareCommand
$user = $em->getRepository('WallabagUserBundle:User')->findOneByUsername($input->getArgument('username'));
}
- if (!is_object($user)) {
+ if (!\is_object($user)) {
throw new Exception(sprintf('User "%s" not found', $input->getArgument('username')));
}
@@ -79,12 +80,12 @@ class ImportCommand extends ContainerAwareCommand
if (true === $res) {
$summary = $import->getSummary();
- $output->writeln(''.$summary['imported'].' imported');
- $output->writeln(''.$summary['skipped'].' already saved');
+ $output->writeln('' . $summary['imported'] . ' imported');
+ $output->writeln('' . $summary['skipped'] . ' already saved');
}
$em->clear();
- $output->writeln('End : '.(new \DateTime())->format('d-m-Y G:i:s').' ---');
+ $output->writeln('End : ' . (new \DateTime())->format('d-m-Y G:i:s') . ' ---');
}
}