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

Always discover blacklisted folders to avoid data loss when modifying selectivesync list. #5459

Merged
merged 1 commit into from
Feb 23, 2023

Conversation

allexzander
Copy link
Contributor

@allexzander allexzander commented Feb 21, 2023

No description provided.

@allexzander allexzander changed the title Always discover blacklisted folders to avoid data loss when modifying… Always discover blacklisted folders to avoid data loss when modifying selectivesync list. Feb 21, 2023
@allexzander allexzander force-pushed the bugfix/discover-blacklisted-folders branch 2 times, most recently from 6dc66fb to a7d291d Compare February 21, 2023 18:41
@codecov
Copy link

codecov bot commented Feb 21, 2023

Codecov Report

Merging #5459 (b34d248) into master (73ae8a1) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head b34d248 differs from pull request most recent head 5574ddb. Consider uploading reports for the commit 5574ddb to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5459      +/-   ##
==========================================
- Coverage   57.83%   57.83%   -0.01%     
==========================================
  Files         141      141              
  Lines       18147    18148       +1     
==========================================
  Hits        10495    10495              
- Misses       7652     7653       +1     
Impacted Files Coverage Δ
src/libsync/discovery.cpp 85.95% <100.00%> (-0.07%) ⬇️
src/libsync/propagateremotemkdir.h 50.00% <0.00%> (-25.00%) ⬇️
src/libsync/progressdispatcher.h 37.50% <0.00%> (-6.95%) ⬇️
src/libsync/owncloudpropagator.h 65.87% <0.00%> (+0.79%) ⬆️

@claucambra
Copy link
Collaborator

@allexzander would this be a fix for #1238 ?

@allexzander
Copy link
Contributor Author

allexzander commented Feb 23, 2023

@allexzander would this be a fix for #1238 ?

hmm, it might, but not 100% sure, were you able to reproduce it? in my case I have a bit more complex repro-steps:

  • one must check/uncheck other folders that were synced while having completely unsynced local folders to make the issue happen

@allexzander allexzander force-pushed the bugfix/discover-blacklisted-folders branch from b34d248 to 68c7294 Compare February 23, 2023 09:56
…n-uploaded files when modifying selectivesync list.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@allexzander allexzander force-pushed the bugfix/discover-blacklisted-folders branch from 68c7294 to 5574ddb Compare February 23, 2023 09:59
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5459-68c7294d5307e5ecacf61d0bbb4986764ccd6ef0-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
Copy link

sonarcloud bot commented Feb 23, 2023

Please retry analysis of this Pull-Request directly on SonarCloud.

test/testlocaldiscovery.cpp Show resolved Hide resolved
test/testlocaldiscovery.cpp Show resolved Hide resolved
@mgallien mgallien merged commit 206a7ef into master Feb 23, 2023
@mgallien mgallien deleted the bugfix/discover-blacklisted-folders branch February 23, 2023 11:36
@allexzander
Copy link
Contributor Author

/backport to stable-3.7

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.

4 participants