Skip to content

Fix recent files #14185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 3 commits into from
Feb 14, 2019
Merged

Fix recent files #14185

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c7424d
We need to initialize the storage else the jailed path is always null
rullzer Feb 13, 2019
cb67c6a
Loop for the recent search
rullzer Feb 13, 2019
62ddb12
Filter out versions and trashbin
rullzer Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions lib/private/Files/Node/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
namespace OC\Files\Node;

use OC\DB\QueryBuilder\Literal;
use OCA\Files_Sharing\SharedStorage;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Config\ICachedMountInfo;
use OCP\Files\FileInfo;
Expand Down Expand Up @@ -376,8 +377,30 @@ public function getRecent($limit, $offset = 0) {
$mountMap = array_combine($storageIds, $mounts);
$folderMimetype = $mimetypeLoader->getId(FileInfo::MIMETYPE_FOLDER);

//todo look into options of filtering path based on storage id (only search in files/ for home storage, filter by share root for shared, etc)
// Search in batches of 500 entries
$searchLimit = 500;
$results = [];
do {
$searchResult = $this->recentSearch($searchLimit, $offset, $storageIds, $folderMimetype);

// Exit condition if there are no more results
if (count($searchResult) === 0) {
break;
}

$parseResult = $this->recentParse($searchResult, $mountMap, $mimetypeLoader);

foreach ($parseResult as $result) {
$results[] = $result;
}

$offset += $searchLimit;
} while (count($results) < $limit);

return array_slice($results, 0, $limit);
}

private function recentSearch($limit, $offset, $storageIds, $folderMimetype) {
$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query = $builder
->select('f.*')
Expand All @@ -388,12 +411,15 @@ public function getRecent($limit, $offset = 0) {
$builder->expr()->neq('f.mimetype', $builder->createNamedParameter($folderMimetype, IQueryBuilder::PARAM_INT)),
$builder->expr()->eq('f.size', new Literal(0))
))
->andWhere($builder->expr()->notLike('f.path', $builder->createNamedParameter('files_versions/%')))
->andWhere($builder->expr()->notLike('f.path', $builder->createNamedParameter('files_trashbin/%')))
->orderBy('f.mtime', 'DESC')
->setMaxResults($limit)
->setFirstResult($offset);
return $query->execute()->fetchAll();
}

$result = $query->execute()->fetchAll();

private function recentParse($result, $mountMap, $mimetypeLoader) {
$files = array_filter(array_map(function (array $entry) use ($mountMap, $mimetypeLoader) {
$mount = $mountMap[$entry['storage']];
$entry['internalPath'] = $entry['path'];
Expand All @@ -416,6 +442,9 @@ public function getRecent($limit, $offset = 0) {
private function getAbsolutePath(IMountPoint $mount, $path) {
$storage = $mount->getStorage();
if ($storage->instanceOfStorage('\OC\Files\Storage\Wrapper\Jail')) {
if ($storage->instanceOfStorage(SharedStorage::class)) {
$storage->getSourceStorage();
}
/** @var \OC\Files\Storage\Wrapper\Jail $storage */
$jailRoot = $storage->getUnjailedPath('');
$rootLength = strlen($jailRoot) + 1;
Expand Down