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.

Sign up for GitHub

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

Jump to bottom

Bugfix nextcloudcmd when syncing results in deleting all files #6773

Merged
merged 5 commits into from
Jun 28, 2024
Merged

Bugfix nextcloudcmd when syncing results in deleting all files #6773

merged 5 commits into from
Jun 28, 2024
+100 −26

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented May 21, 2024 •
edited
Loading

@camilasan camilasan changed the title Bugfix cmd sync Bugfix nextcloudcmd May 21, 2024
@camilasan camilasan changed the title Bugfix nextcloudcmd Bugfix nextcloudcmd when syncing results in deleting all files Jun 4, 2024
@camilasan camilasan force-pushed the bugfix/cmd-sync branch 2 times, most recently from 064ccf4 to 9d53bf8 Compare June 4, 2024 18:46
@camilasan camilasan marked this pull request as ready for review June 4, 2024 18:46
nimishavijay
nimishavijay requested changes Jun 4, 2024
View reviewed changes
Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

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

Super nice! Very concise and clear as well!
I would suggest using "Proceed to remove all files" instead :)

mgallien
mgallien requested changes Jun 5, 2024
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

I tested the code as it is without having ever manually modified the setting promptDeleteAllFiles
so default value (false) kicks in and we get no popup in nextcloud graphical full sync client and cmdlightweight client is not getting stuck
if you change the value to true I get the improved popup in the graphical client but the command line one will get stuck again

src/libsync/syncengine.cpp Outdated Show resolved Hide resolved
src/libsync/syncengine.cpp Outdated Show resolved Hide resolved
@camilasan
Copy link
Member Author

I tested the code as it is without having ever manually modified the setting promptDeleteAllFiles
so default value (false) kicks in and we get no popup in nextcloud graphical full sync client and cmdlightweight client is not getting stuck
if you change the value to true I get the improved popup in the graphical client but the command line one will get stuck again

I know and I tried to decouple the 2 things (the sync trigger from cmd and the notification when using the UI) but I couldn't think of a good of doing that.

@camilasan camilasan force-pushed the bugfix/cmd-sync branch 2 times, most recently from 7d540b7 to 19ae649 Compare June 5, 2024 19:40
@camilasan camilasan force-pushed the bugfix/cmd-sync branch 2 times, most recently from 7fd659c to 22f1c85 Compare June 25, 2024 20:18
claucambra
claucambra reviewed Jun 26, 2024
View reviewed changes
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.

A couple of small comments

src/libsync/syncoptions.h Outdated Show resolved Hide resolved
src/libsync/syncengine.cpp Outdated Show resolved Hide resolved
@camilasan
Copy link
Member Author

/backport to stable-3.13

@camilasan @mgallien
Fix #3144: check for promptDeleteAllFiles config setting before emitt…
1f88052 
…ing signal to display warning.

The signal is not connected to any slot when running nextcloudcmd.
The callback to finish the sync was never being called because the check for the config was done in the slot,
which was never called.

Signed-off-by: Camila Ayres <hello@camilasan.com>
@camilasan @mgallien
Make warning text before deleting all files more clear and concise.
b3ff87b 
Signed-off-by: Camila Ayres <hello@camilasan.com>
@camilasan @mgallien
Use readable variable names.
d7c8365 
Signed-off-by: Camila Ayres <hello@camilasan.com>
@camilasan @mgallien
Add sync option for nextcloudcmd.
7b9b7bc 
Signed-off-by: Camila Ayres <hello@camilasan.com>
@camilasan @mgallien
Add tests to remove all files when sycing with or without nextcloudcmd.
92390cc 
Signed-off-by: Camila Ayres <hello@camilasan.com>
@mgallien mgallien merged commit cb47a6d into master Jun 28, 2024
11 of 13 checks passed
@mgallien mgallien deleted the bugfix/cmd-sync branch June 28, 2024 16:19
@backportbot backportbot bot mentioned this pull request Jun 28, 2024
Merged
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6773-92390cc754f819e27228a6eb0c6fecbb9c2fab7c-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.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jun 28, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra left review comments

@nimishavijay nimishavijay nimishavijay requested changes

@mgallien mgallien mgallien approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@camilasan @nextcloud-desktop-bot @mgallien @nimishavijay @claucambra