fix(MountProvider): Don't setup filesystem for conflict resolution#2216
Merged
fix(MountProvider): Don't setup filesystem for conflict resolution#2216
Conversation
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
3 times, most recently
from
617b70c to
286aa64
Compare
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
286aa64 to
d718276
Compare
mejo-
changed the title
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
2 times, most recently
from
9644ab0 to
db5a60a
Compare
This should no longer be necessary nowadays. Also don't catch FilesNotFoundException in UserFolderHelper, as this error should not result in a 404 response. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
Trying to access a node with the mountpoint name results in a circular situation. This commit changes the implementation to only use the cache. Implementation inspired by how groupfolders does it. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
No longer needed now that the user folder is a mountpoint and conflict resolution happens in the MountProvider. Signed-off-by: Jonas <jonas@freesources.org>
This reverts commit b417c6d. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
db5a60a to
4ceb6f6
Compare
provokateurin
requested changes
Feb 4, 2026
Member
Author
|
Thanks for the thorough review @provokateurin, much appreciated. I hope I addressed all your comments, see the pushed commits. |
* Use row count of sql query to check if it returned results * Use `RootEntryCache:getMimePart()` * Call `IMountPoint::rmdir()` instead of `IMountPoint::unlink()` * Fix incrementing counter when renaming node * Check for parentId instead of path comparision in second query * Check for existence of user collective mountpoint in behat tests Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
e6446e9 to
7a6b62d
Compare
provokateurin
requested changes
Feb 4, 2026
Member
provokateurin
left a comment
provokateurin
left a comment
There was a problem hiding this comment.
Looks pretty much ready now, just some minor details
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
48bdfa2 to
4f06f93
Compare
Member
Author
|
Thanks again @provokateurin, all additional comments addressed 💫 |
* UserFolderHelper: drop unneed check whether userCollectivesFolder is of type Folder * No need to check storageId when querying children of folder that conflicts with mountpoint name * Change do-loop to do-while-loop when renaming conflicting node * Rename `userFolderCache` to `userFolderCacheEntry` to avoid confusion Signed-off-by: Jonas <jonas@freesources.org>
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
4f06f93 to
d4a0051
Compare
Signed-off-by: Jonas <jonas@freesources.org>
mejo-
force-pushed
the
fix/user_mountpoint_timing_issue
branch
from
6601540 to
a10959a
Compare
provokateurin
approved these changes
Feb 4, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Follow-up for #2200.
Trying to access a node with the mountpoint name results in a circular situation. This commit changes the implementation to only use the cache.
Implementation inspired by how groupfolders does it.
🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)