From fd01e9ad7b60081c1b4e54a42580987f3636f6cd Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Tue, 8 Jun 2021 18:05:27 +0200
Subject: Search: add feed search

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 lib/AppInfo/Application.php | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'lib/AppInfo')

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
-- 
cgit v1.2.3