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

[stable-3.9] Do not modify discovered files on disk if not necessary #5958

Merged
merged 8 commits into from
Aug 8, 2023
Merged

[stable-3.9] Do not modify discovered files on disk if not necessary #5958

merged 8 commits into from
Aug 8, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #5872

@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.9.2 milestone Aug 7, 2023
@codecov
Copy link

codecov bot commented Aug 7, 2023 •
edited
Loading

Codecov Report

Merging #5958 (0ca358c) into stable-3.9 (6dfcc86) will decrease coverage by 0.11%.
Report is 56 commits behind head on stable-3.9.
The diff coverage is 100.00%.

❗ Current head 0ca358c differs from pull request most recent head 832f0f8. Consider uploading reports for the commit 832f0f8 to get more accurate results

Additional details and impacted files 
@@              Coverage Diff               @@
##           stable-3.9    #5958      +/-   ##
==============================================
- Coverage       60.41%   60.30%   -0.11%     
==============================================
  Files             145      145              
  Lines           18653    18657       +4     
==============================================
- Hits            11269    11252      -17     
- Misses           7384     7405      +21
Files Changed Coverage Δ
src/csync/csync_exclude.cpp 89.81% <ø> (ø)
src/common/filesystembase.cpp 76.58% <100.00%> (+0.14%) ⬆️
src/libsync/syncengine.cpp 81.12% <100.00%> (+0.07%) ⬆️

... and 4 files with indirect coverage changes

@claucambra claucambra self-requested a review August 8, 2023 04:11
@claucambra
Unify else and if in SyncEngine::slotItemDiscovered for filesystem se…
584ffe6 
…tmodtime check

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Return bool from FileSystem::setFileReadOnlyWeak depending on whether…
3fd8e20 
… permission change was actually made or not

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Only change modification time if any modifications were actually made…
4e5f9e5 
… on downsynced file

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Only attempt conversion to placeholder on new file if VFS enabled in …
568f9e5 
…SyncEngine::slotItemDiscovered

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure file modification time is set if item modtime differs from jou…
d8390b2 
…rnal modtime

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add find method to DiskFileModifier class in SyncEngineTestUtils
e94407a 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add test for unmodified local files not getting mtimes changed upon u…
09d7db4 
…pload to server

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Set modificationHappened to also depend on file size change
832f0f8 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5958-832f0f8764b756d56b391e673fe60e878fbcc663-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 Aug 8, 2023

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.14.1) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@claucambra claucambra merged commit f22db46 into stable-3.9 Aug 8, 2023
10 checks passed
@claucambra claucambra deleted the backport/5872/stable-3.9 branch August 8, 2023 04:39
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

@allexzander allexzander Awaiting requested review from allexzander

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

Successfully merging this pull request may close these issues.
2 participants
@nextcloud-desktop-bot @claucambra