diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-02 11:26:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-02 11:26:37 +0200 |
commit | a687c8d915276eee0c0494156700f7d0c0606735 (patch) | |
tree | 23178dc2407aa1b926b79281c34d8e05b6318d3b /src/Wallabag/ImportBundle/Command | |
parent | 14b8a7c950147d32d7c9782832b87bf2b18b4fd7 (diff) | |
parent | f5924e954730efdb7b9fadf23c0b73b3f5a0a434 (diff) | |
download | wallabag-a687c8d915276eee0c0494156700f7d0c0606735.tar.gz wallabag-a687c8d915276eee0c0494156700f7d0c0606735.tar.zst wallabag-a687c8d915276eee0c0494156700f7d0c0606735.zip |
Merge pull request #2708 from jcharaoui/import-disablecontentupdate
Import disableContentUpdate
Diffstat (limited to 'src/Wallabag/ImportBundle/Command')
-rw-r--r-- | src/Wallabag/ImportBundle/Command/ImportCommand.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php index ce72837a..5f1ab0af 100644 --- a/src/Wallabag/ImportBundle/Command/ImportCommand.php +++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php | |||
@@ -5,6 +5,7 @@ namespace Wallabag\ImportBundle\Command; | |||
5 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; | 5 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
6 | use Symfony\Component\Config\Definition\Exception\Exception; | 6 | use Symfony\Component\Config\Definition\Exception\Exception; |
7 | use Symfony\Component\Console\Input\InputArgument; | 7 | use Symfony\Component\Console\Input\InputArgument; |
8 | use Symfony\Component\Console\Input\InputOption; | ||
8 | use Symfony\Component\Console\Input\InputInterface; | 9 | use Symfony\Component\Console\Input\InputInterface; |
9 | use Symfony\Component\Console\Output\OutputInterface; | 10 | use Symfony\Component\Console\Output\OutputInterface; |
10 | 11 | ||
@@ -17,9 +18,10 @@ class ImportCommand extends ContainerAwareCommand | |||
17 | ->setDescription('Import entries from a JSON export') | 18 | ->setDescription('Import entries from a JSON export') |
18 | ->addArgument('username', InputArgument::REQUIRED, 'User to populate') | 19 | ->addArgument('username', InputArgument::REQUIRED, 'User to populate') |
19 | ->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file') | 20 | ->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file') |
20 | ->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1') | 21 | ->addOption('importer', null, InputOption::VALUE_OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1') |
21 | ->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false) | 22 | ->addOption('markAsRead', null, InputOption::VALUE_OPTIONAL, 'Mark all entries as read', false) |
22 | ->addOption('useUserId', null, InputArgument::OPTIONAL, 'Use user id instead of username to find account', false) | 23 | ->addOption('useUserId', null, InputOption::VALUE_NONE, 'Use user id instead of username to find account') |
24 | ->addOption('disableContentUpdate', null, InputOption::VALUE_NONE, 'Disable fetching updated content from URL') | ||
23 | ; | 25 | ; |
24 | } | 26 | } |
25 | 27 | ||
@@ -69,6 +71,7 @@ class ImportCommand extends ContainerAwareCommand | |||
69 | } | 71 | } |
70 | 72 | ||
71 | $import->setMarkAsRead($input->getOption('markAsRead')); | 73 | $import->setMarkAsRead($input->getOption('markAsRead')); |
74 | $import->setDisableContentUpdate($input->getOption('disableContentUpdate')); | ||
72 | $import->setUser($user); | 75 | $import->setUser($user); |
73 | 76 | ||
74 | $res = $import | 77 | $res = $import |