From 7cc9ba28a7e221e7e9f3723f3a6fb51ad57ea152 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 31 Jan 2023 08:48:45 +0100 Subject: perf(federation): Only request root share info for checking availability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise this would request a full recursive dirctory listing while the result is never being used Signed-off-by: Julius Härtl --- .../files_sharing/lib/Controller/ShareInfoController.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'apps/files_sharing/lib/Controller/ShareInfoController.php') diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php index b090e6efcf1..2b8373af1cd 100644 --- a/apps/files_sharing/lib/Controller/ShareInfoController.php +++ b/apps/files_sharing/lib/Controller/ShareInfoController.php @@ -65,7 +65,7 @@ class ShareInfoController extends ApiController { * @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) { try { $share = $this->shareManager->getShareByToken($t); } catch (ShareNotFound $e) { @@ -96,28 +96,32 @@ class ShareInfoController extends ApiController { } } - 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) { if ($node instanceof File) { return $this->parseFile($node, $permissionMask); } - return $this->parseFolder($node, $permissionMask); + return $this->parseFolder($node, $permissionMask, $depth); } private function parseFile(File $file, int $permissionMask) { return $this->format($file, $permissionMask); } - private function parseFolder(Folder $folder, int $permissionMask) { + private function parseFolder(Folder $folder, int $permissionMask, int $depth) { $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; -- cgit v1.2.3