diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index 289cd82c9c5..ee3b1fba326 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -85,6 +85,7 @@ class FileSearchBackend implements ISearchBackend { new SearchPropertyDefinition('{DAV:}displayname', true, true, true), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME), + new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME), new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN), new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), @@ -297,6 +298,8 @@ class FileSearchBackend implements ISearchBackend { return $node->getName(); case '{DAV:}getlastmodified': return $node->getLastModified(); + case '{http://nextcloud.org/ns}upload_time': + return $node->getNode()->getUploadTime(); case FilesPlugin::SIZE_PROPERTYNAME: return $node->getSize(); case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME: @@ -451,6 +454,8 @@ class FileSearchBackend implements ISearchBackend { return 'mimetype'; case '{DAV:}getlastmodified': return 'mtime'; + case '{http://nextcloud.org/ns}upload_time': + return 'upload_time'; case FilesPlugin::SIZE_PROPERTYNAME: return 'size'; case TagsPlugin::FAVORITE_PROPERTYNAME: diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index ff2d6766893..559d1ccf71c 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -149,10 +149,12 @@ class QuerySearchHelper { $builder = $this->getQueryBuilder(); - $query = $builder->selectFileCache('file', false); - $requestedFields = $this->searchBuilder->extractRequestedFields($searchQuery->getSearchOperation()); + $joinExtendedCache = in_array('upload_time', $requestedFields); + + $query = $builder->selectFileCache('file', $joinExtendedCache); + if (in_array('systemtag', $requestedFields)) { $this->equipQueryForSystemTags($query, $this->requireUser($searchQuery)); } diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index 6a0cba7f1f2..23f662c241f 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -63,6 +63,7 @@ class SearchBuilder { 'share_with' => 'string', 'share_type' => 'integer', 'owner' => 'string', + 'upload_time' => 'integer', ]; /** @var array */ @@ -256,6 +257,7 @@ class SearchBuilder { 'share_with' => ['eq'], 'share_type' => ['eq'], 'owner' => ['eq'], + 'upload_time' => ['eq', 'gt', 'lt', 'gte', 'lte'], ]; if (!isset(self::$fieldTypes[$operator->getField()])) {