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

Skip sync exclude file from list of exclude files if it doesn't exist. #2723

Merged
merged 2 commits into from
Oct 28, 2021
Merged

Skip sync exclude file from list of exclude files if it doesn't exist. #2723

merged 2 commits into from
Oct 28, 2021

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Dec 15, 2020 •
edited
Loading

@camilasan camilasan changed the title If sync exclude file doesn't exist, remove it from the list of exclude files. Remove sync exclude file from list of exclude files if it doesn't exist. Dec 15, 2020
@camilasan camilasan force-pushed the fix-issue-2632 branch 3 times, most recently from 13b89bd to bb0972a Compare December 15, 2020 17:08
@camilasan camilasan mentioned this pull request Dec 15, 2020
Merged
er-vin
er-vin reviewed Dec 16, 2020
View reviewed changes
src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
@camilasan camilasan changed the title Remove sync exclude file from list of exclude files if it doesn't exist. Skip sync exclude file from list of exclude files if it doesn't exist. Feb 2, 2021
@camilasan camilasan requested a review from FlexW February 2, 2021 19:07
er-vin
er-vin reviewed Feb 3, 2021
View reviewed changes
src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
@camilasan camilasan added this to the Desktop 3.2 milestone Apr 27, 2021
@LecrisUT LecrisUT mentioned this pull request Jul 19, 2021
Closed
@mgallien mgallien modified the milestones: Desktop 3.2, Desktop 3.4 Jul 23, 2021
mgallien
mgallien reviewed Aug 25, 2021
View reviewed changes
src/csync/csync_exclude.h Outdated Show resolved Hide resolved
src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
@mgallien mgallien modified the milestones: Desktop 3.4, Desktop 3.3 Sep 7, 2021
@mgallien mgallien removed this from the Desktop 3.3 milestone Oct 13, 2021
@camilasan camilasan force-pushed the fix-issue-2632 branch 6 times, most recently from 0e59d34 to b56de14 Compare October 27, 2021 16:29
mgallien
mgallien reviewed Oct 28, 2021
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.

thanks
just a small change

src/csync/csync_exclude.cpp Outdated Show resolved Hide resolved
Camila added 2 commits October 28, 2021 11:37
Skip sync exclude file from list of exclude files if it doesn't exist.
5788f35 
The file might not exist anymore because the user deleted it by hand or
the folder where it was located got unchecked in the selective sync
view. It is a fix for #2632.

Signed-off-by: Camila <[email protected]>
Expand ExcludedFiles tests.
5decbd0 
Signed-off-by: Camila <[email protected]>
@sonarcloud
Copy link

sonarcloud bot commented Oct 28, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

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

87.0% 87.0% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2723-5decbd0b214d7222e22bb8602fb04cc231c0e94f-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.

@mgallien mgallien merged commit c13668c into master Oct 28, 2021
@mgallien mgallien deleted the fix-issue-2632 branch October 28, 2021 12:57
@mgallien mgallien added this to the 3.4.0 milestone Nov 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@er-vin er-vin er-vin left review comments

@mgallien mgallien mgallien approved these changes

@allexzander allexzander allexzander approved these changes

@FlexW FlexW Awaiting requested review from FlexW

Assignees
No one assigned
Labels
1. to develop
Projects
None yet
Milestone
3.4.0
Development

Successfully merging this pull request may close these issues.
5 participants
@camilasan @nextcloud-desktop-bot @mgallien @er-vin @allexzander