From 01e1db329ced43323654990828744d577cac4ba8 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Tue, 16 Feb 2021 21:16:18 +0100 Subject: Command: Add debug item list commands Signed-off-by: Sean Molenaar --- .github/workflows/api-integration-tests.yml | 9 +++ CHANGELOG.md | 1 + appinfo/info.xml | 3 + lib/Command/Debug/FeedItemList.php | 99 +++++++++++++++++++++++++++ lib/Command/Debug/FolderItemList.php | 100 ++++++++++++++++++++++++++++ lib/Command/Debug/ItemList.php | 94 ++++++++++++++++++++++++++ lib/Db/FeedType.php | 30 --------- lib/Db/ListType.php | 30 +++++++++ 8 files changed, 336 insertions(+), 30 deletions(-) create mode 100644 lib/Command/Debug/FeedItemList.php create mode 100644 lib/Command/Debug/FolderItemList.php create mode 100644 lib/Command/Debug/ItemList.php delete mode 100644 lib/Db/FeedType.php create mode 100644 lib/Db/ListType.php diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml index 3c0d057b3..809d63e4c 100644 --- a/.github/workflows/api-integration-tests.yml +++ b/.github/workflows/api-integration-tests.yml @@ -126,9 +126,17 @@ jobs: working-directory: ../server run: | ./occ news:feed:add 'admin' "https://nextcloud.com/blog/feed/" + ./occ news:feed:add 'admin' "https://github.com/nextcloud/news/releases.atom" ./occ news:feed:list 'admin' | grep 'nextcloud\.com' ./occ news:feed:list 'admin' | grep -F '"faviconLink": "https:\/\/nextcloud.com\/media\/screenshot-150x150.png"' + - name: Functional tests items + working-directory: ../server + run: | + ./occ news:item:list-feed "admin" $(./occ news:feed:list 'admin' | grep 'github\.com' -1 | head -1 | grep -oE '[0-9]*') --limit 200 | grep '15.3.2' + ./occ news:item:list-folder "admin" --limit 200 | grep '15.3.2' + ./occ news:item:list "admin" --limit 200 | grep '15.3.2' + - name: Functional tests opml working-directory: ../server run: ./occ news:opml:export 'admin' | grep 'nextcloud\.com' @@ -138,6 +146,7 @@ jobs: run: | ./occ news:folder:delete 'admin' $(./occ news:folder:list 'admin' | grep 'Something' -1 | head -1 | grep -oE '[0-9]*') ./occ news:feed:delete 'admin' $(./occ news:feed:list 'admin' | grep 'nextcloud\.com' -1 | head -1 | grep -oE '[0-9]*') + ./occ news:feed:delete 'admin' $(./occ news:feed:list 'admin' | grep 'github\.com' -1 | head -1 | grep -oE '[0-9]*') - name: Prep PHP tests working-directory: ../server/apps/news diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bd59c9c4..270484703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1 - Stop returning all feeds after marking folder as read. - Always fetch favicon (#1164) - Use feed logo instead of favicon if it exists and is square +- Add CI for item lists ### Fixed diff --git a/appinfo/info.xml b/appinfo/info.xml index aad6268e8..981efa634 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -70,6 +70,9 @@ Before you update to a new version, [check the changelog](https://github.com/nex OCA\News\Command\Config\FeedDelete OCA\News\Command\Config\FeedDelete OCA\News\Command\Config\OpmlExport + OCA\News\Command\Debug\ItemList + OCA\News\Command\Debug\FolderItemList + OCA\News\Command\Debug\FeedItemList diff --git a/lib/Command/Debug/FeedItemList.php b/lib/Command/Debug/FeedItemList.php new file mode 100644 index 000000000..49820993c --- /dev/null +++ b/lib/Command/Debug/FeedItemList.php @@ -0,0 +1,99 @@ +itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:item:list-feed') + ->setDescription('List all items in a feed') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to list the items for') + ->addArgument('feed', InputArgument::REQUIRED, 'Feed to list the items for') + ->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit for item amount', 40) + ->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Item list offset', 0) + ->addOption('reverse-sort', null, InputOption::VALUE_NONE, 'Item list sorting') + ->addOption('hide-read', null, InputOption::VALUE_NONE, 'Hide read items'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + + $feed = $input->getArgument('feed'); + if (!is_numeric($feed)) { + $output->writeln('Invalid Type!'); + return 255; + } + + $limit = $input->getOption('limit'); + if (!is_numeric($limit)) { + $output->writeln('Invalid limit!'); + return 255; + } + + $offset = $input->getOption('offset'); + if (!is_numeric($offset)) { + $output->writeln('Invalid offset!'); + return 255; + } + + $reverseSort = $input->getOption('reverse-sort'); + $hideRead = $input->getOption('hide-read'); + + $items = $this->itemService->findAllInFeedWithFilters( + $user, + intval($feed), + intval($limit), + intval($offset), + $hideRead, + $reverseSort, + [] + ); + + $output->writeln(json_encode($this->serialize($items), JSON_PRETTY_PRINT)); + + return 0; + } +} diff --git a/lib/Command/Debug/FolderItemList.php b/lib/Command/Debug/FolderItemList.php new file mode 100644 index 000000000..4e6f07dae --- /dev/null +++ b/lib/Command/Debug/FolderItemList.php @@ -0,0 +1,100 @@ +itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:item:list-folder') + ->setDescription('List all items in a folder') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to list the items for') + ->addArgument('folder', InputArgument::OPTIONAL, 'Folder to list the items for') + ->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit for item amount', 40) + ->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Item list offset', 0) + ->addOption('reverse-sort', null, InputOption::VALUE_NONE, 'Item list sorting') + ->addOption('hide-read', null, InputOption::VALUE_NONE, 'Hide read items'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + + $folder = $input->getArgument('folder'); + if (!is_null($folder) && !is_numeric($folder)) { + $output->writeln('Invalid folder ID!'); + return 255; + } + + $limit = $input->getOption('limit'); + if (!is_numeric($limit)) { + $output->writeln('Invalid limit!'); + return 255; + } + + $offset = $input->getOption('offset'); + if (!is_numeric($offset)) { + $output->writeln('Invalid offset!'); + return 255; + } + + $folder = is_null($folder) ? $folder : intval($folder); + $reverseSort = $input->getOption('reverse-sort'); + $hideRead = $input->getOption('hide-read'); + + $items = $this->itemService->findAllInFolderWithFilters( + $user, + $folder, + intval($limit), + intval($offset), + $hideRead, + $reverseSort, + [] + ); + + $output->writeln(json_encode($this->serialize($items), JSON_PRETTY_PRINT)); + + return 0; + } +} diff --git a/lib/Command/Debug/ItemList.php b/lib/Command/Debug/ItemList.php new file mode 100644 index 000000000..06f8b1c1b --- /dev/null +++ b/lib/Command/Debug/ItemList.php @@ -0,0 +1,94 @@ +itemService = $itemService; + } + + /** + * Configure command + * + * @return void + */ + protected function configure() + { + $this->setName('news:item:list') + ->setDescription('List all items') + ->addArgument('user-id', InputArgument::REQUIRED, 'User to list the items for') + ->addOption('type', 't', InputOption::VALUE_REQUIRED, 'Item type', ListType::ALL_ITEMS) + ->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit for item amount', 40) + ->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Item list offset', 0) + ->addOption('reverse-sort', 'r', InputOption::VALUE_NONE, 'Item list sorting'); + } + + /** + * Execute command + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @return int|void + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $user = $input->getArgument('user-id'); + + $type = $input->getOption('type'); + if (!is_numeric($type)) { + $output->writeln('Invalid Type!'); + return 255; + } + $limit = $input->getOption('limit'); + if (!is_numeric($limit)) { + $output->writeln('Invalid limit!'); + return 255; + } + $offset = $input->getOption('offset'); + if (!is_numeric($offset)) { + $output->writeln('Invalid offset!'); + return 255; + } + $reverseSort = $input->getOption('reverse-sort'); + + $items = $this->itemService->findAllWithFilters( + $user, + intval($type), + intval($limit), + intval($offset), + $reverseSort, + [] + ); + + $output->writeln(json_encode($this->serialize($items), JSON_PRETTY_PRINT)); + + return 0; + } +} diff --git a/lib/Db/FeedType.php b/lib/Db/FeedType.php deleted file mode 100644 index 1ccd592a8..000000000 --- a/lib/Db/FeedType.php +++ /dev/null @@ -1,30 +0,0 @@ - - * @author Bernhard Posselt - * @copyright 2012 Alessandro Cosentino - * @copyright 2012-2014 Bernhard Posselt - */ - -namespace OCA\News\Db; - -/** - * Enum FeedType - * - * @package OCA\News\Db - */ -class FeedType -{ - const FEED = 0; - const FOLDER = 1; - const STARRED = 2; - const SUBSCRIPTIONS = 3; - const SHARED = 4; - const EXPLORE = 5; - const UNREAD = 6; -} diff --git a/lib/Db/ListType.php b/lib/Db/ListType.php new file mode 100644 index 000000000..1ccd592a8 --- /dev/null +++ b/lib/Db/ListType.php @@ -0,0 +1,30 @@ + + * @author Bernhard Posselt + * @copyright 2012 Alessandro Cosentino + * @copyright 2012-2014 Bernhard Posselt + */ + +namespace OCA\News\Db; + +/** + * Enum FeedType + * + * @package OCA\News\Db + */ +class FeedType +{ + const FEED = 0; + const FOLDER = 1; + const STARRED = 2; + const SUBSCRIPTIONS = 3; + const SHARED = 4; + const EXPLORE = 5; + const UNREAD = 6; +} -- cgit v1.2.3