- update SDK to add database support for ownerUserName

- search segmenter: add support for owner keyword, incl. localization
owncloud · Apr 16, 2021 · 399ed6d · 399ed6d
1 parent 4fddedf
commit 399ed6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloudAppFramework/Resources/de.lproj/Localizable.strings b/ownCloudAppFramework/Resources/de.lproj/Localizable.strings
@@ -49,6 +49,7 @@
 "keyword_on" = "am";
 "keyword_smaller" = "kleiner";
 "keyword_greater" = "größer";
+"keyword_owner" = "besitzer";
 "keyword_file" = "datei";
 "keyword_folder" = "ordner";
 "keyword_image" = "bild";

diff --git a/ownCloudAppFramework/Resources/en.lproj/Localizable.strings b/ownCloudAppFramework/Resources/en.lproj/Localizable.strings
@@ -51,6 +51,7 @@
 "keyword_on" = "on";
 "keyword_smaller" = "smaller";
 "keyword_greater" = "greater";
+"keyword_owner" = "owner";
 "keyword_file" = "file";
 "keyword_folder" = "folder";
 "keyword_image" = "image";

diff --git a/ownCloudAppFramework/SDK Extensions/OCQueryCondition+SearchSegmenter.m b/ownCloudAppFramework/SDK Extensions/OCQueryCondition+SearchSegmenter.m
@@ -173,6 +173,7 @@ + (nullable NSString *)normalizeKeyword:(NSString *)keyword
 			TranslateKeyword(@"on"),
 			TranslateKeyword(@"smaller"),
 			TranslateKeyword(@"greater"),
+			TranslateKeyword(@"owner"),
 
 			// Suffix keywords
 			TranslateKeyword(@"d"),
@@ -347,6 +348,10 @@ + (instancetype)forSearchSegment:(NSString *)segmentString
 								condition = [OCQueryCondition where:OCItemPropertyNameSize isGreaterThan:byteCount];
 							}
 						}
+						else if ([modifierKeyword isEqual:@"owner"])
+						{
+							condition = [OCQueryCondition where:OCItemPropertyNameOwnerUserName startsWith:parameter];
+						}
 						else if ([modifier isEqual:@""])
 						{
 							// Parse time formats, f.ex.: 7d, 2w, 1m, 2y
@@ -405,7 +410,8 @@ + (instancetype)forSearchSegment:(NSString *)segmentString
 					    [modifierKeyword isEqual:@"before"]  ||
 					    [modifierKeyword isEqual:@"on"]      ||
 					    [modifierKeyword isEqual:@"greater"] ||
-					    [modifierKeyword isEqual:@"smaller"]
+					    [modifierKeyword isEqual:@"smaller"] ||
+					    [modifierKeyword isEqual:@"owner"]
 					   )
 					{
 						// Modifiers without parameters
+2 −0		ownCloudSDK/Item/OCItem.h
+13 −7		ownCloudSDK/Item/OCItem.m
+8 −5		ownCloudSDK/Vaults/Database/OCDatabase+Schemas.m
+3 −0		ownCloudSDK/Vaults/Database/OCDatabase.m