[stable30] fix: Handle copy of folders containing live photos #49650
Conversation
This file contains 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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
artonge
force-pushed
the
backport/48563/stable30
branch
from
62830a7 to
be7b6a7
Compare
Signed-off-by: Louis Chemineau <[email protected]>
artonge
force-pushed
the
backport/49293/stable30
branch
2 times, most recently
from
79ebb1b to
05be967
Compare
artonge
approved these changes
Dec 5, 2024
We need to recursively look for live photos in the folder, and then handle them as usual. Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
artonge
force-pushed
the
backport/49293/stable30
branch
from
f5565be to
f2d2dc1
Compare
Signed-off-by: Louis Chemineau <[email protected]>
artonge
force-pushed
the
backport/49293/stable30
branch
from
f2d2dc1 to
3497725
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| return $this->fileView->copy($sourcePath, $destinationPath); | ||
| $copyOkay = $this->fileView->copy($sourcePath, $destinationPath); | ||
|
|
||
| if (!$copyOkay) { |
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
| if ($peerFileId === null) { | ||
| return; | ||
| } | ||
| $peerFile = $this->userFolder->getFirstNodeById($peerFileId); |
Check notice
Code scanning / Psalm
PossiblyNullReference Note
| if ($event instanceof BeforeNodeCopiedEvent) { | ||
| $this->runMoveOrCopyChecks($sourceNode, $targetNode, $peerFile); | ||
| } elseif ($event instanceof NodeCopiedEvent) { | ||
| $this->handleCopy($sourceNode, $targetNode, $peerFile); |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion Note
Merged
skjnldsv
approved these changes
Dec 12, 2024
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.
Backport of #49293
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.