mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22797 from nextcloud/fix/search/files 

Fix files search provider
This commit is contained in:
John Molakvoæ 2020-09-14 09:02:41 +02:00 committed by GitHub
parent a053aa7221 5724d4c6fe
commit a68e23a536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/lib/Search/FilesSearchProvider.php
View File

@ -31,6 +31,7 @@ namespace OCA\Files\Search;
use OC\Search\Provider\File; use OC\Search\Provider\File;
use OC\Search\Result\File as FileResult; use OC\Search\Result\File as FileResult;
use OCP\Files\IMimeTypeDetector; use OCP\Files\IMimeTypeDetector;
use OCP\Files\IRootFolder;
use OCP\IL10N; use OCP\IL10N;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\IUser; use OCP\IUser;
@ -53,14 +54,19 @@ class FilesSearchProvider implements IProvider {
/** @var IMimeTypeDetector */ /** @var IMimeTypeDetector */
private $mimeTypeDetector; private $mimeTypeDetector;
/** @var IRootFolder */
private $rootFolder;
public function __construct(File $fileSearch, public function __construct(File $fileSearch,
IL10N $l10n, IL10N $l10n,
IURLGenerator $urlGenerator, IURLGenerator $urlGenerator,
IMimeTypeDetector $mimeTypeDetector) { IMimeTypeDetector $mimeTypeDetector,
IRootFolder $rootFolder) {
$this->l10n = $l10n; $this->l10n = $l10n;
$this->fileSearch = $fileSearch; $this->fileSearch = $fileSearch;
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;
$this->mimeTypeDetector = $mimeTypeDetector; $this->mimeTypeDetector = $mimeTypeDetector;
$this->rootFolder = $rootFolder;
} }
/** /**
@ -92,6 +98,10 @@ class FilesSearchProvider implements IProvider {
* @inheritDoc * @inheritDoc
*/ */
public function search(IUser $user, ISearchQuery $query): SearchResult { public function search(IUser $user, ISearchQuery $query): SearchResult {
// Make sure we setup the users filesystem
$this->rootFolder->getUserFolder($user->getUID());
return SearchResult::complete( return SearchResult::complete(
$this->l10n->t('Files'), $this->l10n->t('Files'),
array_map(function (FileResult $result) { array_map(function (FileResult $result) {