Skip to content

search files by id in shared storages last #15776

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

Merged
rullzer merged 1 commit into from
May 29, 2019
Merged

search files by id in shared storages last #15776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
search files by id in shared storages last 
this prevents unneeded recursion when the file is not in the share

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed May 28, 2019
commit 98dd526010c4ccc66ac69cf90bc300984fb8f2de
8 changes: 8 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 @@ -49,6 +49,7 @@
use OC\Files\Mount\MoveableMount;
use OC\Files\Storage\Storage;
use OC\User\User;
use OCA\Files_Sharing\SharedMount;
use OCP\Constants;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\EmptyFileNameException;
Expand Down Expand Up @@ -1718,6 +1719,13 @@ public function getPath($id) {
// reverse the array so we start with the storage this view is in
// which is the most likely to contain the file we're looking for
$mounts = array_reverse($mounts);

// put non shared mounts in front of the shared mount
// this prevent unneeded recursion into shares
usort($mounts, function(IMountPoint $a, IMountPoint $b) {
return $a instanceof SharedMount && (!$b instanceof SharedMount) ? 1 : -1;
});

foreach ($mounts as $mount) {
/**
* @var \OC\Files\Mount\MountPoint $mount
Expand Down