Adjust REPORT search query, perf and unit tests

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

@@ -182,6 +182,7 @@ public function onReport($reportName, $report, $uri) {
 		if (empty($filterRules['systemtag']) && is_null($filterRules['favorite'])) {
 			// load all
 			$results = $reportTargetNode->getChildren();
+			$results = $this->slice($results, $report);
 		} else {
 			// gather all file ids matching filter
 			try {
@@ -190,16 +191,14 @@ public function onReport($reportName, $report, $uri) {
 				throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
 			}
 
+			// pre-slice the results if needed for pagination to not waste
+			// time resolving nodes that will not be returned anyway
+			$resultFileIds = $this->slice($resultFileIds, $report);
+
 			// find sabre nodes by file id, restricted to the root node path
 			$results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
 		}
 
-		if (!is_null($report->limit)) {
-			$length = $report->limit['size'];
-			$offset = $report->limit['page'] * $length;
-			$results = array_slice($results, $offset, $length);
-		}
-
 		$filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
 		$results = $this->prepareResponses($filesUri, $requestedProps, $results);
 
@@ -212,6 +211,15 @@ public function onReport($reportName, $report, $uri) {
 		return false;
 	}
 
+	private function slice($results, $report) {
+		if (!is_null($report->search)) {
+			$length = $report->search['limit'];
+			$offset = $report->search['offset'];
+			$results = array_slice($results, $offset, $length);
+		}
+		return $results;
+	}
+
 	/**
 	 * Returns the base uri of the files root by removing
 	 * the subpath from the URI

apps/dav/lib/Files/Xml/FilterRequest.php

@@ -24,7 +24,7 @@ class FilterRequest implements XmlDeserializable {
 	/**
 	 * @var array
 	 */
-	public $limit;
+	public $search;
 
 	/**
 	 * The deserialize method is called during xml parsing.
@@ -51,7 +51,7 @@ static function xmlDeserialize(Reader $reader) {
 		$elems = (array)$reader->parseInnerTree([
 			'{DAV:}prop' => KeyValue::class,
 			'{http://owncloud.org/ns}filter-rules' => Base::class,
-			'{http://owncloud.org/ns}limit' => Base::class
+			'{http://owncloud.org/ns}search' => KeyValue::class,
 		]);
 
 		$newProps = [
@@ -60,7 +60,7 @@ static function xmlDeserialize(Reader $reader) {
 				'favorite' => null
 			],
 			'properties' => [],
-			'limit'      => null,
+			'search' => null,
 		];
 
 		if (!is_array($elems)) {
@@ -85,13 +85,16 @@ static function xmlDeserialize(Reader $reader) {
 						}
 					}
 					break;
-				case '{http://owncloud.org/ns}limit' :
-					// TODO verify page and size
-					$newProps['limit'] = $elem['attributes'];
+				case '{http://owncloud.org/ns}search' :
+					$value = $elem['value'];
+					if (isset($value['{http://owncloud.org/ns}limit'])) {
+						$newProps['search']['limit'] = (int)$value['{http://owncloud.org/ns}limit'];
+					}
+					if (isset($value['{http://owncloud.org/ns}offset'])) {
+						$newProps['search']['offset'] = (int)$value['{http://owncloud.org/ns}offset'];
+					}
 					break;
-
 			}
-
 		}
 
 		$obj = new self();