[stable33] Add repair step for share targets with excess (2) #57858
+428
−92
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
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…e positives Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
force-pushed
the
share-target-repair-33
branch
from
70ecabc to
2cf7599
Compare
come-nc
reviewed
Jan 29, 2026
Comment on lines
+79
to
+81
| $this->shareManager->moveShare($share, $recipient->getUID()); | ||
|
|
||
| $this->shareTargetValidator->verifyMountPoint( |
Contributor
There was a problem hiding this comment.
I’m surprised by the order here, verifyMountPoint may change the share target, so the moveShare call should happen afterwards, no?
artonge
reviewed
Jan 29, 2026
| $query = $this->connection->getQueryBuilder(); | ||
| $query->select('id', 'share_type', 'share_with') | ||
| ->from('share') | ||
| ->where($query->expr()->like('file_target', $query->createNamedParameter('% (2) (2)%'))) |
Contributor
There was a problem hiding this comment.
To cover more cases:
Suggested change
| ->where($query->expr()->like('file_target', $query->createNamedParameter('% (2) (2)%'))) | |
| ->where($query->expr()->like('file_target', $query->createNamedParameter('% (_) (_)%'))) |
| } | ||
|
|
||
| private function cleanTarget(string $target): string { | ||
| return preg_replace('/ \(2\)+/', '', $target); |
Contributor
There was a problem hiding this comment.
To match the above suggestion:
Suggested change
| return preg_replace('/ \(2\)+/', '', $target); | |
| return preg_replace('/ \([2-9]\)+/', '', $target); |
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.
Requires:
Todo: