Move search to proper Controller

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

core/Controller/SearchController.php

@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\ISearch;
+
+class SearchController extends Controller {
+
+ /** @var ISearch */
+ private $searcher;
+
+ public function __construct(string $appName,
+ IRequest $request,
+ ISearch $search) {
+ parent::__construct($appName, $request);
+
+ $this->searcher = $search;
+ }
+
+ /**
+ * @NoAdminRequired
+ */
+ public function search(string $query, array $inApps = [], int $page = 1, int $size = 30): JSONResponse {
+ $results = $this->searcher->searchPaged($query, $inApps, $page, $size);
+
+ return new JSONResponse($results);
+ }
+}

core/routes.php

@@ -66,6 +66,7 @@
  ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
  ['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'],
  ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+ ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
  ],
  'ocs' => [
  ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
@@ -81,9 +82,6 @@
 
 /** @var $this OCP\Route\IRouter */
 // Core ajax actions
-// Search
-$this->create('search_ajax_search', '/core/search')
- ->actionInclude('core/search/ajax/search.php');
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
  ->actionInclude('core/ajax/update.php');