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

[stable-3.9] Set VFS PinState to Excluded for ignored files. #5904

Merged
merged 3 commits into from
Jul 20, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #5853

m7913d and others added 3 commits July 20, 2023 13:03
Setting PinState to Excluded ensures the syncing icon is not shown for ignored items.
If the PinState is not set to Excluded, also all parent directories are shown as being synced, which is very inconvenient for the end user as it seems that some folder are never fully synced by Nextcloud which isn't the case.
As long as .lnk files are not converted to placeholder files, also set them to Excluded to hide the syncing icon.

Closes #5524
Closes #5594

Co-authored-by: Matthieu Gallien <[email protected]>
Signed-off-by: Dries Mys <[email protected]>
F.ex. Folder::slotWatchedPathChanged calls this function on non-
placeholder files to check if the ignored file is already assigned an
Excluded pin state. Note that it is allowed to set the pin state to
Excluded on non-placeholder files.

Signed-off-by: Dries Mys <[email protected]>
@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.9.1 milestone Jul 20, 2023
@mgallien mgallien self-requested a review July 20, 2023 13:05
@mgallien mgallien enabled auto-merge July 20, 2023 13:05
@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 A 0 Code Smells

77.8% 77.8% Coverage
0.0% 0.0% Duplication

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

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5904-470a983b474d9f00fa1c880f97c57c38acbc08e0-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.

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #5904 (470a983) into stable-3.9 (cb58ff4) will increase coverage by 0.13%.
The diff coverage is 69.23%.

Additional details and impacted files
@@              Coverage Diff               @@
##           stable-3.9    #5904      +/-   ##
==============================================
+ Coverage       60.31%   60.45%   +0.13%     
==============================================
  Files             145      145              
  Lines           18640    18650      +10     
==============================================
+ Hits            11242    11274      +32     
+ Misses           7398     7376      -22     
Impacted Files Coverage Δ
src/common/pinstate.h 0.00% <ø> (ø)
src/libsync/vfs/cfapi/cfapiwrapper.cpp 72.85% <50.00%> (-0.34%) ⬇️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 82.44% <72.72%> (-0.63%) ⬇️

... and 2 files with indirect coverage changes

@mgallien mgallien merged commit f8dae64 into stable-3.9 Jul 20, 2023
@mgallien mgallien deleted the backport/5853/stable-3.9 branch July 20, 2023 13:43
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