pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch '2.6' into master

Browse Source
This commit is contained in:
Yassine Guedidi
2025-06-05 00:21:05 +02:00
parent 30a22e690b 4f34cfa6fc
commit 8fd5a5273d
23 changed files with 749 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Command/Import/ImportCommand.php
View File

@ -21,6 +21,7 @@ use Wallabag\Import\FirefoxImport;
use Wallabag\Import\InstapaperImport;
use Wallabag\Import\OmnivoreImport;
use Wallabag\Import\PinboardImport;
use Wallabag\Import\PocketCsvImport;
use Wallabag\Import\PocketHtmlImport;
use Wallabag\Import\ReadabilityImport;
use Wallabag\Import\ShaarliImport;
@ -48,6 +49,7 @@ class ImportCommand extends Command
private readonly ElcuratorImport $elcuratorImport,
private readonly ShaarliImport $shaarliImport,
private readonly PocketHtmlImport $pocketHtmlImport,
private readonly PocketCsvImport $pocketCsvImport,
private readonly OmnivoreImport $omnivoreImport,
) {
parent::__construct();
@ -58,7 +60,7 @@ class ImportCommand extends Command
$this
->addArgument('username', InputArgument::REQUIRED, 'User to populate')
->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file')
->addOption('importer', null, InputOption::VALUE_OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, delicious, readability, firefox, chrome, elcurator, shaarli or pocket', 'v1')
->addOption('importer', null, InputOption::VALUE_OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, delicious, readability, firefox, chrome, elcurator, shaarli, pocket or pocket_csv', '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')
@ -109,6 +111,7 @@ class ImportCommand extends Command
'elcurator' => $this->elcuratorImport,
'shaarli' => $this->shaarliImport,
'pocket' => $this->pocketHtmlImport,
'pocket_csv' => $this->pocketCsvImport,
'omnivore' => $this->omnivoreImport,
default => $this->wallabagV1Import,
};