Skip to content

Use the existing info from the share root to get source storage and path #10919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
icewind1991 wants to merge 3 commits into from
Closed

Use the existing info from the share root to get source storage and path #10919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6072b
use the existing info from the share root to get source storage and path
icewind1991 Aug 29, 2018
cbaffde
more efficient `findByNumericId` for mounts
icewind1991 Aug 29, 2018
f132162
handle mount not found when trying to get share source
icewind1991 Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use the existing info from the share root to get source storage and path 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Aug 29, 2018
commit ca6072bc8041fa1ccad963e9862fcc5a5c20013c
5 changes: 3 additions & 2 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ private function init() {
$this->initialized = true;
try {
Filesystem::initMountPoints($this->superShare->getShareOwner());
$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
list($this->nonMaskedStorage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath);
$this->rootPath = $this->getSourceRootInfo()->getPath();
$mounts = $this->ownerView->getMountByNumericId($this->getSourceRootInfo()->getStorageId());
$this->nonMaskedStorage = $mounts[0]->getStorage();
$this->storage = new PermissionsMask([
'storage' => $this->nonMaskedStorage,
'mask' => $this->superShare->getPermissions()
Expand Down
11 changes: 11 additions & 0 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,17 @@ public function getMount($path) {
return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
}

/**
* @param int $id
* @return IMountPoint[]
*/
public function getMountByNumericId($id) {
$mounts = Filesystem::getMountByNumericId($id);
return array_values(array_filter($mounts, function(IMountPoint $mountPoint) {
return $this->getRelativePath($mountPoint->getMountPoint()) || $mountPoint->getInternalPath($this->fakeRoot);
}));
}

/**
* resolve a path to a storage and internal path
*
Expand Down