mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 13:55:47 +03:00
Recover from error if trying to upload a file that is already locked.
This commit is contained in:
parent
40c1f93205
commit
5541ec44a9
4 changed files with 12 additions and 0 deletions
|
@ -81,6 +81,8 @@ OwnCloudSync::OwnCloudSync(QString name, OwnPasswordManager *passwordManager,
|
|||
this, SLOT(updateDBUpload(QString)));
|
||||
connect(mWebdav,SIGNAL(directoryCreated(QString)),
|
||||
this, SLOT(serverDirectoryCreated(QString)));
|
||||
connect(mWebdav,SIGNAL(errorFileLocked(QString)),
|
||||
this, SLOT(errorFileLocked(QString)));
|
||||
|
||||
mDownloadingFiles.clear();
|
||||
mDownloadConflict.clear();
|
||||
|
@ -123,6 +125,11 @@ OwnCloudSync::OwnCloudSync(QString name, OwnPasswordManager *passwordManager,
|
|||
updateStatus();
|
||||
}
|
||||
|
||||
void OwnCloudSync::errorFileLocked(QString fileName)
|
||||
{
|
||||
emit toLog(tr("File %s locked. Skipping!").arg(fileName));
|
||||
}
|
||||
|
||||
void OwnCloudSync::setSaveDBTime(qint64 seconds)
|
||||
{
|
||||
mSaveDBTimer->stop();
|
||||
|
|
|
@ -217,6 +217,7 @@ public slots:
|
|||
void loadDBFromFile();
|
||||
void requestTimedout();
|
||||
void serverDirectoryCreated(QString name);
|
||||
void errorFileLocked(QString fileName);
|
||||
};
|
||||
|
||||
#endif // OWNCLOUDSYNC_H
|
||||
|
|
|
@ -665,6 +665,9 @@ void QWebDAV::processLockRequest(QByteArray xml, QString url, QString extra)
|
|||
if(!exception.isNull()&&exception.text()
|
||||
=="Sabre_DAV_Exception_ConflictingLock") {
|
||||
syncDebug() << "Resource already locked!";
|
||||
if(extra != "") {
|
||||
emit errorFileLocked(mTransferLockRequests[extra].fileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -176,6 +176,7 @@ signals:
|
|||
void uploadComplete(QString name);
|
||||
void directoryCreated(QString name);
|
||||
void directoryListingError(QString url);
|
||||
void errorFileLocked(QString fileName);
|
||||
|
||||
public slots:
|
||||
void slotFinished ( QNetworkReply* );
|
||||
|
|
Loading…
Reference in a new issue