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/restore folders recursively #6134

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Conversation

mgallien
Copy link
Collaborator

No description provided.

@mgallien
Copy link
Collaborator Author

/backport to stable-3.10

@mgallien mgallien enabled auto-merge October 11, 2023 10:08
@mgallien mgallien force-pushed the bugfix/restoreFoldersRecursively branch from ea85c78 to f2d7e29 Compare October 11, 2023 13:00
we should not try to restore files/folders no longer synced because of
selective sync when detecting a data fingerprint change

in case the user deselect a folder from selective sync list, we would do
a local delete

in case the client is also detecting a change of data fingerprint (or is
stuck in restore mode) then instead of applying the new set of selected
folders to sync, it would upload unselected files/folders

Signed-off-by: Matthieu Gallien <[email protected]>
in case sync would complete after a data fingerprint change, we should
tolerate some errors

a file being blacklisted for whatever reason should not block the
propagation of data fingerprint

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/restoreFoldersRecursively branch from f2d7e29 to 242135d Compare October 16, 2023 20:00
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6134-242135d9d92ea0f71a2940efc585177fc8a8766e-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.

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell C 7 Code Smells

75.0% 75.0% Coverage
0.0% 0.0% Duplication

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

@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

Merging #6134 (242135d) into master (f6140f5) will increase coverage by 0.08%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6134      +/-   ##
==========================================
+ Coverage   60.47%   60.56%   +0.08%     
==========================================
  Files         145      145              
  Lines       18814    18814              
==========================================
+ Hits        11378    11394      +16     
+ Misses       7436     7420      -16     
Files Coverage Δ
src/libsync/clientsideencryption.cpp 37.93% <ø> (ø)
src/libsync/owncloudpropagator.h 65.35% <100.00%> (ø)
src/libsync/syncengine.cpp 79.91% <100.00%> (ø)
src/libsync/syncengine.h 65.00% <ø> (ø)

... and 5 files with indirect coverage 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.

I don't see any changes to calls/connections to slotPropagationFinished, I am guessing these do not need to be changed to use the enum?

@mgallien mgallien merged commit ab59845 into master Oct 17, 2023
11 of 13 checks passed
@mgallien mgallien deleted the bugfix/restoreFoldersRecursively branch October 17, 2023 05:38
@mgallien mgallien added this to the 3.11.0 milestone Dec 12, 2023
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.

3 participants