Skip to content

search files by id in shared storages last - #15776

Merged
rullzer merged 1 commit into
masterfrom
get-by-id-shares-last
May 29, 2019
Merged

search files by id in shared storages last#15776
rullzer merged 1 commit into
masterfrom
get-by-id-shares-last

Conversation

@icewind1991

Copy link
Copy Markdown
Member

this prevents unneeded recursion when the file is not in the share

Signed-off-by: Robin Appelman robin@icewind.nl

@icewind1991icewind1991 added the 3. to review Waiting for reviews label May 28, 2019
@icewind1991icewind1991 added this to the Nextcloud 17 milestone May 28, 2019
Comment threadlib/private/Files/View.php Outdated

// put non shared mounts in front of the shared mount
// this prevent unneeded recursion into shares
$sharedMount = array_filter($mounts, function(IMountPoint $mountPoint) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't u use a custom sort function here? Is this faster? 🤔

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, changed

this prevents unneeded recursion when the file is not in the share
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the get-by-id-shares-last branch from 728bd9d to 98dd526CompareMay 28, 2019 18:04
@icewind1991

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@icewind1991

Copy link
Copy Markdown
MemberAuthor

/backport to stable15

@blizzz

Copy link
Copy Markdown
Member

this seems to fix also possible ServiceUnavailale exceptions when unsharing (in some conditions i could not reproduce though)

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 29, 2019
@rullzer
rullzer merged commit 58fe0b8 into masterMay 29, 2019
@rullzer
rullzer deleted the get-by-id-shares-last branch May 29, 2019 19:56
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable16 in #15799

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable15 in #15800

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@icewind1991@blizzz@rullzer@kesselb