mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Propagator: Upload files with future timestamps. #2880

Browse source
This commit is contained in:
Christian Kamm 2015-02-26 11:00:06 +01:00
parent 842e5ba5e0
commit c37792f58f
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/folderman.cpp
View file

@ -43,8 +43,9 @@ FolderMan* FolderMan::_instance = 0;
* The minimum time between a sync being requested and it
* being executed in milliseconds.
*
* This delay must be larger than the minFileAgeForUpload in
* the propagator.
* This delay must be large enough to ensure fileIsStillChanging()
* in the upload propagator doesn't decide to skip the file because
* the modification was too recent.
*/
static qint64 msBetweenRequestAndSync = 2000;

26
src/libsync/propagateupload.cpp
View file

@ -31,16 +31,23 @@
namespace OCC {
/**
* The mtime of a file must be at least this many milliseconds in
* the past for an upload to be started. Otherwise the propagator will
* assume it's still being changed and skip it.
* We do not want to upload files that are currently being modified.
* To avoid that, we don't upload files that have a modification time
* that is too close to the current time.
*
* This value must be smaller than the msBetweenRequestAndSync in
* the folder manager.
*
* Two seconds has shown to be a good value in tests.
* This interacts with the msBetweenRequestAndSync delay in the folder
* manager. If that delay between file-change notification and sync
* has passed, we should accept the file for upload here.
*/
static int minFileAgeForUpload = 2000;
static bool fileIsStillChanging(const SyncFileItem & item)
{
const QDateTime modtime = Utility::qDateTimeFromTime_t(item._modtime);
const qint64 msSinceMod = modtime.msecsTo(QDateTime::currentDateTime());
return msSinceMod < 2000
// if the mtime is too much in the future we *do* upload the file
&& msSinceMod > -10000;
}
static qint64 chunkSize() {
static uint chunkSize;
@ -165,8 +172,7 @@ void PropagateUploadFileQNAM::start()
// But skip the file if the mtime is too close to 'now'!
// That usually indicates a file that is still being changed
// or not yet fully copied to the destination.
QDateTime modtime = Utility::qDateTimeFromTime_t(_item._modtime);
if (modtime.msecsTo(QDateTime::currentDateTime()) < minFileAgeForUpload) {
if (fileIsStillChanging(_item)) {
_propagator->_anotherSyncNeeded = true;
done(SyncFileItem::SoftError, tr("Local file changed during sync."));
return;