diff options
author | Julien Veyssier <eneiluj@posteo.net> | 2022-03-21 13:33:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-21 13:33:22 +0300 |
commit | b85bdf44270800b7b67cf32782d3fdcd3129a605 (patch) | |
tree | 0ebd5d39c072be7eea0f379ceda9e108e17551a0 | |
parent | 012668d5d6a7f8e69c57bc0dd0831c363762aff6 (diff) | |
parent | 71a9ebc754cabda63c517144131b6270412a66b5 (diff) |
Merge pull request #31193 from nextcloud/enh/webdav-propfind-count-sub-elements
Add optional WebDav propfind properties to count sub elements
-rw-r--r-- | apps/dav/lib/Connector/Sabre/FilesPlugin.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 95f3db9a65b..017b1d31841 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -77,6 +77,8 @@ class FilesPlugin extends ServerPlugin { public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time'; public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time'; public const SHARE_NOTE = '{http://nextcloud.org/ns}note'; + public const SUBFOLDER_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-folder-count'; + public const SUBFILE_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-file-count'; /** * Reference to main server object @@ -435,7 +437,7 @@ class FilesPlugin extends ServerPlugin { }); } - if ($node instanceof \OCA\DAV\Connector\Sabre\Directory) { + if ($node instanceof Directory) { $propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node) { return $node->getSize(); }); @@ -443,6 +445,23 @@ class FilesPlugin extends ServerPlugin { $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function () use ($node) { return $node->getFileInfo()->isEncrypted() ? '1' : '0'; }); + + $requestProperties = $propFind->getRequestedProperties(); + if (in_array(self::SUBFILE_COUNT_PROPERTYNAME, $requestProperties, true) + || in_array(self::SUBFOLDER_COUNT_PROPERTYNAME, $requestProperties, true)) { + $nbFiles = 0; + $nbFolders = 0; + foreach ($node->getChildren() as $child) { + if ($child instanceof File) { + $nbFiles++; + } elseif ($child instanceof Directory) { + $nbFolders++; + } + } + + $propFind->handle(self::SUBFILE_COUNT_PROPERTYNAME, $nbFiles); + $propFind->handle(self::SUBFOLDER_COUNT_PROPERTYNAME, $nbFolders); + } } } |