mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-13 07:34:52 +03:00
[CSE] Add handling for side-by-side uploads.
This commit is contained in:
parent
ccd8cff4db
commit
70d562668c
2 changed files with 15 additions and 3 deletions
|
@ -276,13 +276,24 @@ void PropagateUploadFileCommon::slotTryLock(const QByteArray& fileId)
|
|||
void PropagateUploadFileCommon::slotFolderLockedSuccessfully(const QByteArray& fileId, const QByteArray& token)
|
||||
{
|
||||
qDebug() << "Folder" << fileId << "Locked Successfully for Upload";
|
||||
// Should I use a mutex here?
|
||||
_currentLockingInProgress = true;
|
||||
}
|
||||
|
||||
void PropagateUploadFileCommon::slotFolderLockedError(const QByteArray& fileId, int httpErrorCode)
|
||||
{
|
||||
// Add a counter or Something, this will enter in a loop.
|
||||
QTimer::singleShot(1000, this, [this, fileId]{
|
||||
if (_folderLockFirstTry.elapsed() > /* one minute */ 60000) {
|
||||
/* try to call the lock from 5 to 5 seconds
|
||||
and fail if it's more than 5 minutes. */
|
||||
QTimer::singleShot(5000, this, [this, fileId]{
|
||||
if (!_currentLockingInProgress) {
|
||||
qDebug() << "Error locking the folder while no other update is locking it up.";
|
||||
qDebug() << "Perhaps another client locked it.";
|
||||
qDebug() << "Abort";
|
||||
return;
|
||||
}
|
||||
|
||||
// Perhaps I should remove the elapsed timer if the lock is from this client?
|
||||
if (_folderLockFirstTry.elapsed() > /* five minutes */ 1000 * 60 * 5 ) {
|
||||
qDebug() << "One minute passed, ignoring more attemps to lock the folder.";
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -290,6 +290,7 @@ private slots:
|
|||
// Private Encryption Stuff
|
||||
private:
|
||||
QElapsedTimer _folderLockFirstTry;
|
||||
bool _currentLockingInProgress;
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue