Search: add feed search

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

2 files changed, 81 insertions, 26 deletions

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index ea7beeae5..55f9b0ff5 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -19,9 +19,9 @@ use HTMLPurifier;
 use HTMLPurifier_Config;
 use Favicon\Favicon;
 
-use OCA\News\Config\LegacyConfig;
 use OCA\News\Config\FetcherConfig;
 use OCA\News\Hooks\UserDeleteHook;
+use OCA\News\Search\FeedSearchProvider;
 use OCA\News\Search\FolderSearchProvider;
 
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -29,8 +29,6 @@ use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\ITempManager;
 use OCP\AppFramework\App;
-use OCP\Files\IRootFolder;
-use OCP\Files\Node;
 
 use OCA\News\Fetcher\FeedFetcher;
 use OCA\News\Fetcher\Fetcher;
@@ -83,12 +81,12 @@ class Application extends App implements IBootstrap
         });
 
         $context->registerSearchProvider(FolderSearchProvider::class);
+        $context->registerSearchProvider(FeedSearchProvider::class);
 
         $context->registerEventListener(BeforeUserDeletedEvent::class, UserDeleteHook::class);
 
         // parameters
         $context->registerParameter('exploreDir', __DIR__ . '/../Explore/feeds');
-        $context->registerParameter('configFile', 'config.ini');
 
         $context->registerService(HTMLPurifier::class, function (ContainerInterface $c): HTMLPurifier {
             $directory = $c->get(ITempManager::class)->getTempBaseDir() . '/news/cache/purifier';
@@ -142,28 +140,6 @@ class Application extends App implements IBootstrap
             $favicon->cache(['dir' => $c->get(ITempManager::class)->getTempBaseDir()]);
             return $favicon;
         });
-
-        //TODO: Remove code after 15.1
-        $context->registerService('ConfigFolder', function (ContainerInterface $c): ?Node {
-            /** @var IRootFolder $fs */
-            $fs = $c->get(IRootFolder::class);
-            $path = 'news/config';
-            if ($fs->nodeExists($path)) {
-                return $fs->get($path);
-            } else {
-                return null;
-            }
-        });
-
-        //TODO: Remove code after 15.1
-        $context->registerService(LegacyConfig::class, function (ContainerInterface $c): LegacyConfig {
-            $config = new LegacyConfig(
-                $c->get('ConfigFolder'),
-                $c->get(LoggerInterface::class)
-            );
-            $config->read($c->get('configFile'), false);
-            return $config;
-        });
     }
 
     public function boot(IBootContext $context): void
diff --git a/lib/Search/FeedSearchProvider.php b/lib/Search/FeedSearchProvider.php
new file mode 100644
index 000000000..bbcd466e4
--- /dev/null
+++ b/lib/Search/FeedSearchProvider.php
@@ -0,0 +1,79 @@
+<?php
+declare(strict_types=1);
+
+namespace OCA\News\Search;
+
+use OCA\News\Service\FeedServiceV2;
+use OCA\News\Service\FolderServiceV2;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+/**
+ * Class FeedSearchProvider
+ *
+ * @package OCA\News\Search
+ */
+class FeedSearchProvider implements IProvider
+{
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var FeedServiceV2 */
+    private $service;
+
+    public function __construct(IL10N $l10n, IURLGenerator $urlGenerator, FeedServiceV2 $service)
+    {
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->service = $service;
+    }
+
+    public function getId(): string
+    {
+        return 'news_feed';
+    }
+
+    public function getName(): string
+    {
+        return $this->l10n->t('News feeds');
+    }
+
+    public function getOrder(string $route, array $routeParameters): int
+    {
+        if ($route === 'news.page.index') {
+            // Active app, prefer my results
+            return -1;
+        }
+
+        return 60;
+    }
+
+    public function search(IUser $user, ISearchQuery $query): SearchResult
+    {
+        $list = [];
+        $term = strtolower($query->getTerm());
+
+        foreach ($this->service->findAllForUser($user->getUID()) as $feed) {
+            if (strpos(strtolower($feed->getTitle()), $term) === false) {
+                continue;
+            }
+
+            $list[] = new SearchResultEntry(
+                $this->urlGenerator->imagePath('core', 'filetypes/text.svg'),
+                $feed->getTitle(),
+                $this->l10n->t('Unread articles') . ': ' . $feed->getUnreadCount(),
+                $this->urlGenerator->linkToRoute('news.page.index') . '#/items/feeds/' . $feed->getId()
+            );
+        }
+
+        return SearchResult::complete($this->l10n->t('News'), $list);
+    }
+}