Merge pull request #36452 from nextcloud/perf/share-availability-check

perf(federation): Only request root share info for checking availability
nextcloud · Feb 3, 2023 · 1fed799 · 1fed799
2 parents 7cff390 + 7e3ea01
commit 1fed799
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php
@@ -65,7 +65,7 @@ public function __construct(string $appName,
 	 * @param ?string $dir
 	 * @return JSONResponse
 	 */
-	public function info(string $t, ?string $password = null, ?string $dir = null) {
+	public function info(string $t, ?string $password = null, ?string $dir = null, int $depth = -1): JSONResponse {
 		try {
 			$share = $this->shareManager->getShareByToken($t);
 		} catch (ShareNotFound $e) {
@@ -96,34 +96,39 @@ public function info(string $t, ?string $password = null, ?string $dir = null) {
 			}
 		}
 
-		return new JSONResponse($this->parseNode($node, $permissionMask));
+		return new JSONResponse($this->parseNode($node, $permissionMask, $depth));
 	}
 
-	private function parseNode(Node $node, int $permissionMask) {
+	private function parseNode(Node $node, int $permissionMask, int $depth): array {
 		if ($node instanceof File) {
 			return $this->parseFile($node, $permissionMask);
 		}
-		return $this->parseFolder($node, $permissionMask);
+		/** @var Folder $node */
+		return $this->parseFolder($node, $permissionMask, $depth);
 	}
 
-	private function parseFile(File $file, int $permissionMask) {
+	private function parseFile(File $file, int $permissionMask): array {
 		return $this->format($file, $permissionMask);
 	}
 
-	private function parseFolder(Folder $folder, int $permissionMask) {
+	private function parseFolder(Folder $folder, int $permissionMask, int $depth): array {
 		$data = $this->format($folder, $permissionMask);
 
+		if ($depth === 0) {
+			return $data;
+		}
+
 		$data['children'] = [];
 
 		$nodes = $folder->getDirectoryListing();
 		foreach ($nodes as $node) {
-			$data['children'][] = $this->parseNode($node, $permissionMask);
+			$data['children'][] = $this->parseNode($node, $permissionMask, $depth <= -1 ? -1 : $depth - 1);
 		}
 
 		return $data;
 	}
 
-	private function format(Node $node, int $permissionMask) {
+	private function format(Node $node, int $permissionMask): array {
 		$entry = [];
 
 		$entry['id'] = $node->getId();

diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
@@ -214,7 +214,7 @@ public function test() {
 	public function checkStorageAvailability() {
 		// see if we can find out why the share is unavailable
 		try {
-			$this->getShareInfo();
+			$this->getShareInfo(0);
 		} catch (NotFoundException $e) {
 			// a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote
 			if ($this->testRemote()) {
@@ -308,7 +308,7 @@ public function remoteIsOwnCloud(): bool {
 	 * @throws NotFoundException
 	 * @throws \Exception
 	 */
-	public function getShareInfo() {
+	public function getShareInfo(int $depth = -1) {
 		$remote = $this->getRemote();
 		$token = $this->getToken();
 		$password = $this->getPassword();
@@ -331,7 +331,7 @@ public function getShareInfo() {
 		$client = \OC::$server->getHTTPClientService()->newClient();
 		try {
 			$response = $client->post($url, [
-				'body' => ['password' => $password],
+				'body' => ['password' => $password, 'depth' => $depth],
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);