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

Enforce virtual file type when it is falsely marked as non-virtual. Added more logs for scenarios when virtual placeholder gets marked as non-virtual. #6158

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Enforce virtual file type when it is falsely marked as non-virtual. Added more logs for scenarios when virtual placeholder gets marked as non-virtual. #6158

merged 1 commit into from
Oct 25, 2023

Conversation

allexzander
Copy link
Contributor

@allexzander allexzander commented Oct 23, 2023 •
edited
Loading

No description provided.

@allexzander allexzander changed the title Enforce virtual file type when it is falsely marked as non-virtual. A… Enforce virtual file type when it is falsely marked as non-virtual. Added more logs for scenarios when virtual placeholder gets marked as non-virtual. Oct 23, 2023
mgallien
mgallien reviewed Oct 23, 2023
View reviewed changes
src/libsync/discovery.cpp Outdated Show resolved Hide resolved
src/libsync/syncfileitem.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/vfs_cfapi.cpp Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Oct 23, 2023 •
edited
Loading

Codecov Report

Merging #6158 (ed5387f) into master (1d6991f) will decrease coverage by 0.01%.
Report is 15 commits behind head on master.
The diff coverage is 53.84%.

❗ Current head ed5387f differs from pull request most recent head 406bad8. Consider uploading reports for the commit 406bad8 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #6158      +/-   ##
==========================================
- Coverage   60.74%   60.73%   -0.01%     
==========================================
  Files         145      145              
  Lines       18837    18846       +9     
==========================================
+ Hits        11443    11447       +4     
- Misses       7394     7399       +5
Files Coverage Δ
src/libsync/discovery.cpp 86.53% <100.00%> (+0.03%) ⬆️
src/libsync/syncfileitem.cpp 63.63% <100.00%> (+0.33%) ⬆️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 82.96% <0.00%> (-1.57%) ⬇️

... and 2 files with indirect coverage changes

@allexzander allexzander force-pushed the bugfix/vfs-state-incorrect branch from 7dbd30d to e4df423 Compare October 23, 2023 14:50
mgallien
mgallien reviewed Oct 23, 2023
View reviewed changes
src/libsync/syncfileitem.cpp Outdated Show resolved Hide resolved
src/libsync/syncfileitem.cpp Outdated Show resolved Hide resolved
@allexzander allexzander force-pushed the bugfix/vfs-state-incorrect branch from 8a85239 to 25ef0a9 Compare October 23, 2023 18:42
@mgallien
Copy link
Collaborator

/backport to stable-3.10

@mgallien mgallien enabled auto-merge October 25, 2023 09:01
@allexzander allexzander force-pushed the bugfix/vfs-state-incorrect branch from 25ef0a9 to ed5387f Compare October 25, 2023 09:03
@allexzander @mgallien
Enforce virtual file type when it is falsely marked as non-virtual. A…
406bad8 
…dded more logs for scenarios when virtual placeholder gets marked as non-virtual.

Signed-off-by: alex-z <[email protected]>
@mgallien mgallien force-pushed the bugfix/vfs-state-incorrect branch from ed5387f to 406bad8 Compare October 25, 2023 09:28
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6158-406bad8ab49a4eb65b0d2f7984e6e1338cb29f81-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 A 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

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

@mgallien mgallien merged commit 3b92054 into master Oct 25, 2023
9 of 11 checks passed
@mgallien mgallien deleted the bugfix/vfs-state-incorrect branch October 25, 2023 11:45
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Oct 25, 2023
Merged
@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
Reviewers

@claucambra claucambra claucambra approved these changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

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

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