mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-16 10:41:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Parallel chunk upload: Fix progress

Browse source
This commit is contained in:
Olivier Goffart 2014-09-18 12:36:30 +02:00
parent 66595a3597
commit 1b62ed1e7e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mirall/propagator_qnam.cpp
View file

@ -262,12 +262,9 @@ void PropagateUploadFileQNAM::startNextChunk()
// Don't do parallel upload of chunk if this might be the last chunk because the server cannot handle that // Don't do parallel upload of chunk if this might be the last chunk because the server cannot handle that
// https://github.com/owncloud/core/issues/11106 // https://github.com/owncloud/core/issues/11106
// We return now and when the _jobs will be finished we will proceed the last chunk // We return now and when the _jobs will be finished we will proceed the last chunk
qWarning() << "WTF" << _currentChunk << _chunkCount << _startChunk;
return; return;
} }
qWarning() << "Go Go Go " << _jobs.count() << _currentChunk << _chunkCount << _startChunk;
/* /*
* // If the source file has changed during upload, it is detected and the * // If the source file has changed during upload, it is detected and the
* // variable _previousFileSize is set accordingly. The propagator waits a * // variable _previousFileSize is set accordingly. The propagator waits a
@ -504,7 +501,17 @@ void PropagateUploadFileQNAM::slotUploadProgress(qint64 sent, qint64)
int progressChunk = _currentChunk + _startChunk - 1; int progressChunk = _currentChunk + _startChunk - 1;
if (progressChunk >= _chunkCount) if (progressChunk >= _chunkCount)
progressChunk = _currentChunk - 1; progressChunk = _currentChunk - 1;
emit progress(_item, sent + progressChunk * chunkSize()); quint64 amount = progressChunk * chunkSize();
sender()->setProperty("byteWritten", sent);
if (_jobs.count() == 1) {
amount += sent;
} else {
amount -= (_jobs.count() -1) * chunkSize();
foreach (QObject *j, _jobs) {
amount += j->property("byteWritten").toULongLong();
}
}
emit progress(_item, amount);
} }
void PropagateUploadFileQNAM::startPollJob(const QString& path) void PropagateUploadFileQNAM::startPollJob(const QString& path)