avoid modifying a placeholder (virtual files) when not needed #6212

mgallien · 2023-11-09T21:58:47Z

codecov · 2023-11-09T22:21:04Z

Codecov Report

Merging #6212 (3dc583c) into master (e30decc) will increase coverage by 0.04%.
Report is 40 commits behind head on master.
The diff coverage is 100.00%.

❗ Current head 3dc583c differs from pull request most recent head bf78f00. Consider uploading reports for the commit bf78f00 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #6212      +/-   ##
==========================================
+ Coverage   60.74%   60.79%   +0.04%     
==========================================
  Files         145      145              
  Lines       18841    18836       -5     
==========================================
+ Hits        11445    11451       +6     
+ Misses       7396     7385      -11

Files	Coverage Δ
src/common/vfs.h	`52.38% <100.00%> (ø)`
src/libsync/owncloudpropagator.cpp	`84.52% <100.00%> (ø)`
src/libsync/owncloudpropagator.h	`65.35% <ø> (ø)`
src/libsync/propagateupload.cpp	`75.54% <100.00%> (ø)`
src/libsync/vfs/cfapi/vfs_cfapi.cpp	`82.96% <100.00%> (ø)`
src/libsync/vfs/suffix/vfs_suffix.cpp	`84.44% <ø> (ø)`
src/libsync/vfs/suffix/vfs_suffix.h	`40.00% <ø> (ø)`

... and 3 files with indirect coverage changes

mgallien · 2023-11-09T22:32:23Z

/backport to stable-3.10

mgallien · 2023-11-14T10:18:38Z

test windows build
https://cloud.nextcloud.com/s/zgYcCcpCaBwgn7q
done from the stable branch with this PR applied on top of it

src/common/vfs.h

src/libsync/vfs/cfapi/cfapiwrapper.cpp

src/common/vfs.h

allexzander

looks nice, but see my comment for the enum, also, kindly check why the test is failing

src/libsync/vfs/cfapi/vfs_cfapi.cpp

shoudl ensure that included headers are self sufficient Signed-off-by: Matthieu Gallien <[email protected]>

acoid modifying some metadata of the placeholder when this placeholder has just been uploaded to the server (will avoid truncating the timestamps) Close #6190 Signed-off-by: Matthieu Gallien <[email protected]>

Signed-off-by: Matthieu Gallien <[email protected]>

nextcloud-desktop-bot · 2023-12-06T09:48:47Z

AppImage file: nextcloud-PR-6212-bf78f008bddc034f66ab5cfac98dae6c24ac9aae-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 · 2023-12-06T09:57:02Z

/backport to stable-3.11

sonarcloud · 2023-12-06T10:21:18Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

munrobasher · 2023-12-08T18:10:13Z

I see that 3.10.2 has just been released. Do I assume that 3.11 is mentioned above that this fix isn't in the 3.10.2 release? Don't quite understand the version process vs Git.

mgallien requested review from camilasan, allexzander and claucambra November 9, 2023 21:58

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 78efb88 to b1b600d Compare November 9, 2023 22:00

mgallien enabled auto-merge November 9, 2023 22:32

backportbot-nextcloud bot added the backport-request label Nov 9, 2023

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from b1b600d to 3dc583c Compare November 10, 2023 08:35

allexzander force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 3dc583c to 0e6bced Compare November 13, 2023 13:19

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 0e6bced to 06b6a4f Compare November 13, 2023 16:37

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch 2 times, most recently from 8a41d5a to 7138292 Compare November 20, 2023 12:46

allexzander reviewed Nov 28, 2023

View reviewed changes

src/common/vfs.h Outdated Show resolved Hide resolved

src/libsync/vfs/cfapi/cfapiwrapper.cpp Show resolved Hide resolved

allexzander reviewed Nov 28, 2023

View reviewed changes

src/common/vfs.h Outdated Show resolved Hide resolved

allexzander suggested changes Nov 28, 2023

View reviewed changes

src/libsync/vfs/cfapi/vfs_cfapi.cpp Show resolved Hide resolved

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch 2 times, most recently from 33b24c2 to d648eda Compare December 4, 2023 22:21

mgallien requested a review from allexzander December 4, 2023 22:22

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from d648eda to 2f31231 Compare December 5, 2023 07:58

allexzander approved these changes Dec 5, 2023

View reviewed changes

mgallien disabled auto-merge December 6, 2023 09:02

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 04ce773 to a28b949 Compare December 6, 2023 09:04

mgallien added 3 commits December 6, 2023 10:08

fix include order from most specific to less specific

369296d

shoudl ensure that included headers are self sufficient Signed-off-by: Matthieu Gallien <[email protected]>

avoid modifying a placeholder (virtual files) when not needed

b77fc9d

acoid modifying some metadata of the placeholder when this placeholder has just been uploaded to the server (will avoid truncating the timestamps) Close #6190 Signed-off-by: Matthieu Gallien <[email protected]>

extend log to get information about mtime modifications by the client

bf78f00

Signed-off-by: Matthieu Gallien <[email protected]>

mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from a28b949 to bf78f00 Compare December 6, 2023 09:42

mgallien merged commit 2c5281c into master Dec 6, 2023
8 of 10 checks passed

mgallien deleted the bugfix/doNotModifyUploadedVirtualFiles branch December 6, 2023 09:53

backportbot-nextcloud bot mentioned this pull request Dec 6, 2023

[stable-3.10] avoid modifying a placeholder (virtual files) when not needed #6262

Merged

backportbot-nextcloud bot removed the backport-request label Dec 6, 2023

backportbot-nextcloud bot added the backport-request label Dec 6, 2023

backportbot-nextcloud bot mentioned this pull request Dec 6, 2023

[stable-3.11] avoid modifying a placeholder (virtual files) when not needed #6263

Merged

backportbot-nextcloud bot removed the backport-request label Dec 6, 2023

mgallien added this to the 3.12.0 milestone Dec 12, 2023

Mika-6-9 mentioned this pull request Dec 12, 2023

Excel says the document might have been saved by another person after some time #3456

Closed

munrobasher mentioned this pull request Feb 14, 2024

[Bug]: Nextcloud isn't preserving millisecond value on file modified timestamp which causes some apps to get confused #6190

Closed

8 tasks

Mika-6-9 mentioned this pull request Jul 19, 2024

[Bug]: Release 3.12.7 and V3.13.x - Excel says "Overwrite changes" #6933

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

avoid modifying a placeholder (virtual files) when not needed #6212

avoid modifying a placeholder (virtual files) when not needed #6212

mgallien commented Nov 9, 2023 •

edited

Loading

codecov bot commented Nov 9, 2023 •

edited

Loading

mgallien commented Nov 9, 2023

mgallien commented Nov 14, 2023

allexzander left a comment •

edited

Loading

nextcloud-desktop-bot commented Dec 6, 2023

mgallien commented Dec 6, 2023

sonarcloud bot commented Dec 6, 2023

munrobasher commented Dec 8, 2023

avoid modifying a placeholder (virtual files) when not needed #6212

avoid modifying a placeholder (virtual files) when not needed #6212

Conversation

mgallien commented Nov 9, 2023 • edited Loading

codecov bot commented Nov 9, 2023 • edited Loading

Codecov Report

mgallien commented Nov 9, 2023

mgallien commented Nov 14, 2023

allexzander left a comment • edited Loading

Choose a reason for hiding this comment

nextcloud-desktop-bot commented Dec 6, 2023

mgallien commented Dec 6, 2023

sonarcloud bot commented Dec 6, 2023

munrobasher commented Dec 8, 2023

mgallien commented Nov 9, 2023 •

edited

Loading

codecov bot commented Nov 9, 2023 •

edited

Loading

allexzander left a comment •

edited

Loading