upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Recursively fetch subshares

Browse source 
Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2022-04-27 13:17:22 +02:00 committed by Louis (Rebase PR Action)
parent b513ac51fb
commit 0fb4ecadae
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/Updater.php
View file

@ -69,9 +69,7 @@ class Updater {
$shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_ROOM, $src, false, -1));
if ($src instanceof Folder) {
// also check children
$subShares = $shareManager->getSharesInFolder($userFolder->getOwner()->getUID(), $src, false);
// flatten the result
$subShares = $shareManager->getSharesInFolderRecursive($userFolder->getOwner()->getUID(), $src, false);
foreach ($subShares as $subShare) {
$shares = array_merge($shares, array_values($subShare));
}

18
lib/private/Share20/Manager.php
View file

@ -1319,6 +1319,24 @@ class Manager implements IManager {
}, []);
}
public function getSharesInFolderRecursive(string $userId, Folder $node, $reshares = false) {
$shares = $this->getSharesInFolder($userId, $node, $reshares);
foreach ($node->getDirectoryListing() as $subnode) {
if (!$subnode instanceof Folder) {
continue;
}
$subShares = $this->getSharesInFolderRecursive($userId, $subnode, $reshares);
foreach ($subShares as $fileId => $subSharesForFile) {
$shares[$fileId] = array_merge($shares[$fileId] ?? [], $subSharesForFile);
}
}
return $shares;
}
/**
* @inheritdoc
*/

8
lib/public/Share/IManager.php
View file

@ -140,6 +140,14 @@ interface IManager {
*/
public function getSharesInFolder($userId, Folder $node, $reshares = false);
/**
* Recursively get all shares shared by (initiated) by the provided user in a folder.
*
* @return IShare[][] [$fileId => IShare[], ...]
* @since 11.0.0
*/
public function getSharesInFolderRecursive(string $userId, Folder $node, bool $reshares = false);
/**
* Get shares shared by (initiated) by the provided user.
*