Check if localModifiedTime >= item.mtime: avoid re-upload

[mp1994]

In file sync.d, in function private void applyDifference(JSONValue driveItem, string driveId, bool isRoot), check if localModifiedTime is greater or equal to the item modified time (item.mtime). This avoid the re-upload in case another process has modified the file in the local disk and that change is already synchronized with remote.

This happens when local file time = remote file time > local database time

Example (that requires no fix): remote file time > local file time = local database time, if the file is modified online. The sync correctly updates the local file with no issues.
Example (that requires this fix): local file is changed using a Windows Virtual Machine with OneDrive, that updates also the remote file. When onedrive --synchronize runs on linux, the local file time is equal to the remote time, and both are greater than the local database time. This fix avoids the safeRename while updating the local database entry.

This may be very specific to my configuration, but it should be completely transparent to "conventional" configurations. Thus, I hope this PR will be merged!

[abraunegg]

@mp1994
Thanks for the PR. There are some issues with it which I need to fix up, but also will make some comments in your code changes as well to assist with some understanding before I commit some changes here.

[abraunegg]

remote item here is not 'local' or 'remote', but a OneDrive object that resides on another drive id which is not the account default - typically this is onedrive shared folder

[abraunegg]

this will need to be cleaned up

[abraunegg]

item.mtime is not the database item - but the item provided by OneDrive via the API

[abraunegg]

@mp1994
Please can you review the updated PR before this gets merged into 'master'

[mp1994]

@abraunegg thank you for working on this, I have tested the PR with the following output

$ ./onedrive --synchronize --verbose --verbose

Output of the log relative to the modified file:

[DEBUG] OneDrive item ID is present in local database
The local item has a different modified time 2020-Nov-07 20:57:23Z when compared to database modified time 2020-Nov-07 15:03:14Z
The local item has a different hash when compared to database item hash
[DEBUG] localModifiedTime (local file): 2020-Nov-07 20:57:23Z
[DEBUG] item.mtime (OneDrive item):     2020-Nov-07 20:57:23Z
Local item modified time is equal to OneDrive item modified time based on UTC time conversion - keeping local item
[DEBUG] Skipping OneDrive change as this is determined to be unwanted due to local item modified time being newer than OneDrive item

It worked as intended, the local file is kept without safeRename being called (i.e., no copy of the file is created/uploaded).
The database entry appears to be updated correctly.
Thank you also for improving the comments on the source code, which was already very well commented and documented.

[abraunegg]

@mp1994
Thanks for validating. I have updated that final debug line output to be cleaner in messaging, and will commit this to master

[mp1994]

@mp1994
Thanks for validating. I have updated that final debug line output to be cleaner in messaging, and will commit this to master

@abraunegg that's great, thank you!

[github-actions]

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.