fixup! feat(dav): Support multiple scopes in DAV search

nextcloud · Apr 16, 2024 · 817ac06 · 817ac06
1 parent 91e6cdd
commit 817ac06
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php
@@ -169,6 +169,7 @@ public function search(Query $search): array {
 			if (!$node instanceof Directory) {
 				throw new \InvalidArgumentException('Search is only supported on directories');
 			}
+
 			$fileInfo = $node->getFileInfo();
 			/** @var Folder $folder */
 			$folder = $this->rootFolder->get($fileInfo->getPath());
@@ -179,11 +180,23 @@ public function search(Query $search): array {
 			} else {
 				$internalPath = $folder->getInternalPath();
 			}
-			$scopes[] = new SearchComparison(
-				ISearchComparison::COMPARE_LIKE,
-				'path',
-				$internalPath . '/%',
-				''
+
+			$scopes[] = new SearchBinaryOperator(
+				ISearchBinaryOperator::OPERATOR_AND,
+				[
+					new SearchComparison(
+						ISearchComparison::COMPARE_EQUAL,
+						'storage',
+						$folderStorage->getCache()->getNumericStorageId(),
+						''
+					),
+					new SearchComparison(
+						ISearchComparison::COMPARE_LIKE,
+						'path',
+						$internalPath . '/%',
+						''
+					),
+				]
 			);
 		}