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

Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking. #5293

Merged

Conversation

allexzander
Copy link
Contributor

Signed-off-by: alex-z [email protected]

@codecov
Copy link

codecov bot commented Dec 20, 2022

Codecov Report

Merging #5293 (50ffc73) into master (cecd24b) will decrease coverage by 0.11%.
The diff coverage is 88.88%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5293      +/-   ##
==========================================
- Coverage   57.69%   57.58%   -0.12%     
==========================================
  Files         139      139              
  Lines       17614    17631      +17     
==========================================
- Hits        10163    10153      -10     
- Misses       7451     7478      +27     
Impacted Files Coverage Δ
src/libsync/propagatedownload.h 40.54% <ø> (ø)
src/libsync/propagatedownload.cpp 65.75% <88.88%> (+0.85%) ⬆️
src/libsync/vfs/cfapi/hydrationjob.cpp 52.38% <0.00%> (-3.71%) ⬇️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 83.07% <0.00%> (-2.37%) ⬇️
src/libsync/vfs/cfapi/cfapiwrapper.cpp 72.95% <0.00%> (-1.37%) ⬇️
src/libsync/syncengine.cpp 81.03% <0.00%> (-0.72%) ⬇️
src/libsync/discovery.cpp 85.93% <0.00%> (-0.29%) ⬇️

@allexzander allexzander requested a review from mgallien December 22, 2022 18:00
@allexzander allexzander force-pushed the bugfix/do-not-generate-conflict-when-locking-and-unlocking branch 2 times, most recently from ed42534 to dc3e6d9 Compare December 29, 2022 17:35
@mgallien mgallien force-pushed the bugfix/do-not-generate-conflict-when-locking-and-unlocking branch from dc3e6d9 to 9cf7728 Compare December 30, 2022 15:37
…ile file remains unchanged. Fix subsequent conflict when locking and unlocking.

Signed-off-by: alex-z <[email protected]>
@allexzander allexzander force-pushed the bugfix/do-not-generate-conflict-when-locking-and-unlocking branch from 9cf7728 to 50ffc73 Compare December 30, 2022 15:57
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5293-50ffc7373fd4f0cd645343622754ff55f4350a49-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 4 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@allexzander allexzander merged commit 4dd2221 into master Dec 30, 2022
@allexzander allexzander deleted the bugfix/do-not-generate-conflict-when-locking-and-unlocking branch December 30, 2022 16:32
@mgallien mgallien added this to the 3.7.0 milestone Jan 30, 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.

4 participants