diff --git a/apps/dav/lib/Capabilities.php b/apps/dav/lib/Capabilities.php index 9566b029a99a8..a019f4dfaee9b 100644 --- a/apps/dav/lib/Capabilities.php +++ b/apps/dav/lib/Capabilities.php @@ -44,6 +44,7 @@ public function getCapabilities() { $capabilities = [ 'dav' => [ 'chunking' => '1.0', + 'search_supports_upload_time' => true, ] ]; if ($this->config->getSystemValueBool('bulkupload.enabled', true)) { diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index d5492a42ffca8..63695de6185ed 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -105,6 +105,7 @@ public function getPropertyDefinitionsForScope(string $href, ?string $path): arr 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), @@ -317,6 +318,8 @@ private function getSearchResultProperty(SearchResult $result, SearchPropertyDef 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: @@ -471,6 +474,8 @@ private function mapPropertyNameToColumn(SearchPropertyDefinition $property) { 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 849135d44f00e..4f8aa3e8cce23 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -173,10 +173,12 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array $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 1ba1aa5be9631..0fd64a62ec388 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -84,6 +84,7 @@ class SearchBuilder { 'share_with' => 'string', 'share_type' => 'integer', 'owner' => 'string', + 'upload_time' => 'integer', ]; /** @var array */ @@ -277,6 +278,7 @@ private function validateComparison(ISearchComparison $operator) { 'share_with' => ['eq'], 'share_type' => ['eq'], 'owner' => ['eq'], + 'upload_time' => ['eq', 'gt', 'lt', 'gte', 'lte'], ]; if (!isset(self::$fieldTypes[$operator->getField()])) {