implements search on null/notnull metadata

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Nov 14, 2023 · 5229965 · 5229965
1 parent 9e7fc23
commit 5229965
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php
@@ -39,6 +39,7 @@
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
+use OCP\Files\Search\ISearchComparison;
 use OCP\Files\Search\ISearchOperator;
 use OCP\Files\Search\ISearchOrder;
 use OCP\Files\Search\ISearchQuery;
@@ -376,13 +377,16 @@ private function transformSearchOperation(Operator $operator) {
 
 				$property = $operator->arguments[0];
 				$value = $this->castValue($property, $operator->arguments[1]->value);
+			case Operator::OPERATION_IS_DEFINED:
+				$property = $property ?? $operator->arguments[0];
 				if (str_starts_with($property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
-					return new SearchComparison($trimmedType, substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX)), $value, IMetadataQuery::EXTRA);
+					$field = substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX));
+					$extra = IMetadataQuery::EXTRA;
 				} else {
-					return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($property), $value);
+					$field = $this->mapPropertyNameToColumn($property);
 				}
+				return new SearchComparison(ISearchComparison::COMPARE_DEFINED, $field, $value ?? '', $extra ?? '');
 
-				// no break
 			case Operator::OPERATION_IS_COLLECTION:
 				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
 			default:

diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php
@@ -47,6 +47,7 @@ class SearchBuilder {
 		ISearchComparison::COMPARE_GREATER_THAN_EQUAL => 'gte',
 		ISearchComparison::COMPARE_LESS_THAN => 'lt',
 		ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'lte',
+		ISearchComparison::COMPARE_DEFINED => 'isNotNull',
 	];
 
 	protected static $searchOperatorNegativeMap = [
@@ -57,6 +58,7 @@ class SearchBuilder {
 		ISearchComparison::COMPARE_GREATER_THAN_EQUAL => 'lt',
 		ISearchComparison::COMPARE_LESS_THAN => 'gte',
 		ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'gt',
+		ISearchComparison::COMPARE_DEFINED => 'isNull',
 	];
 
 	public const TAG_FAVORITE = '_$!<Favorite>!$_';

diff --git a/lib/public/Files/Search/ISearchComparison.php b/lib/public/Files/Search/ISearchComparison.php
@@ -35,6 +35,7 @@ interface ISearchComparison extends ISearchOperator {
 	public const COMPARE_LESS_THAN_EQUAL = 'lte';
 	public const COMPARE_LIKE = 'like';
 	public const COMPARE_LIKE_CASE_SENSITIVE = 'clike';
+	public const COMPARE_DEFINED = 'defined';
 
 	public const HINT_PATH_EQ_HASH = 'path_eq_hash'; // transform `path = "$path"` into `path_hash = md5("$path")`, on by default