Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/fix vfs folder state when remote move is forbidden #6717

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

mgallien
Copy link
Collaborator

No description provided.

@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from d1aef86 to 7275b8a Compare May 2, 2024 08:54
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

It looks like there are some unrelated changes from #6718

@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 7275b8a to b058995 Compare May 6, 2024 10:13
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from b058995 to c9d76f7 Compare May 16, 2024 09:55
when remote move is forbidden, desktop client will move back the folder
to its original name

in such cases, we were forgetting to set VFS metadata in their proper
state (i.e. placeholder in sync)

so ensure that when a remote move fails, we still touch VFS metadata
when appropriate and handle errors

Signed-off-by: Matthieu Gallien <[email protected]>
when doing local discovery, it is possible that files or folders may be
discovered with VFS metadata not up to date (i.e. placeholder file not
set in sync)

in such case, generate a propagation instruction to set them in sync

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from c9d76f7 to 9202dfd Compare May 16, 2024 13:42
@mgallien mgallien requested a review from claucambra May 16, 2024 13:42
Copy link

sonarcloud bot commented May 16, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
17 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6717-9202dfd84d2c221bf47256d92707046dd34d7d26-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants