mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not sent more chunk and cancel the upload when the file change while uploading chunks

Browse source
This commit is contained in:
Olivier Goffart 2014-03-06 16:04:32 +01:00
parent 114c8de814
commit ac393c6374
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/mirall/propagator_qnam.cpp
View file

@ -160,31 +160,9 @@ void PropagateUploadFileQNAM::slotPutFinished()
QNetworkReply::NetworkError err = job->reply()->error();
if (err != QNetworkReply::NoError) {
// /* If the source file changed during submission, lets try again */
// if( state == HBF_SOURCE_FILE_CHANGE ) {
// if( attempts++ < 5 ) { /* FIXME: How often do we want to try? */
// qDebug("SOURCE file has changed during upload, retry #%d in %d seconds!", attempts, 2*attempts);
// sleep(2*attempts);
// if( _previousFileSize == 0 ) {
// _previousFileSize = _item._size;
// } else {
// _previousFileSize = trans->stat_size;
// }
// continue;
// }
//
// const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely");
// done( SyncFileItem::SoftError, errMsg );
// } else if( state == HBF_USER_ABORTED ) {
// const QString errMsg = tr("Sync was aborted by user.");
// done( SyncFileItem::SoftError, errMsg );
// } else {
// // Other HBF error conditions.
// // FIXME: find out the error class.
// _item._httpErrorCode = hbf_fail_http_code(trans.data());
_item._httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
//FIXME: classify error
_propagator->_activeJobs--;
if(checkForProblemsWithShared(_item._httpErrorCode,
tr("The file was edited locally but is part of a read only share. "
"It is restored and your edit is in the conflict file."))) {
@ -196,7 +174,18 @@ void PropagateUploadFileQNAM::slotPutFinished()
}
bool finished = job->reply()->hasRawHeader("ETag");
if (!finished) {
if (Utility::qDateTimeToTime_t(QFileInfo(_propagator->_localDir + _item._file).lastModified())
!= _item._modtime) {
/* Uh oh: The local file has changed during upload */
_propagator->_activeJobs--;
done(SyncFileItem::SoftError, tr("Local file changed during sync."));
// FIXME: the previous code was retrying for a few seconds.
return;
}
// Proceed to next chunk.
_currentChunk++;
if (_currentChunk >= _chunkCount) {