handle moveFromStorage within the same storage even when storage wrap… #17264
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…pers are applied to the source storage the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this Signed-off-by: Robin Appelman <robin@icewind.nl>
rullzer
reviewed
Sep 25, 2019
| * @var Jail $sourceStorage | ||
| */ | ||
| $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath); | ||
| $sourceStorage = $sourceStorage->getUnjailedStorage(); |
There was a problem hiding this comment.
it is, in the next loop iteration
There was a problem hiding this comment.
I thought the same .... Pretty nice the while we loop the storage wrappers up thing.
kesselb
reviewed
Sep 25, 2019
| private function isSameStorage(IStorage $storage): bool { | ||
| while ($storage->instanceOfStorage(Wrapper::class)) { | ||
| /** | ||
| * @var Wrapper $sourceStorage |
There was a problem hiding this comment.
Suggested change
| * @var Wrapper $sourceStorage | |
| * @var Wrapper |
rullzer
approved these changes
Sep 25, 2019
|
@icewind1991 backport? |
|
/backport to stable17 |
|
/backport to stable16 |
|
backport to stable17 in #17277 |
|
backport to stable16 in #17278 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…pers are applied to the source storage
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that
Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this
You can test this by using groupfolders on a nextcloud instance using object storage, currently this will use the fallback "copy+delete" path in that case instead of a simple rename