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

Recover from error if trying to upload a file that is already locked.

Browse source
This commit is contained in:
Juan Carlos Cornejo 2012-01-19 23:20:03 -05:00 committed by Klaas Freitag
parent 40c1f93205
commit 5541ec44a9
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
owncloud_sync_qt/OwnCloudSync.cpp
View file

@ -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();

1
owncloud_sync_qt/OwnCloudSync.h
View file

@ -217,6 +217,7 @@ public slots:
void loadDBFromFile();
void requestTimedout();
void serverDirectoryCreated(QString name);
void errorFileLocked(QString fileName);
};
#endif // OWNCLOUDSYNC_H

3
owncloud_sync_qt/qwebdav/QWebDAV.cpp
View file

@ -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);
}
}
}
}

1
owncloud_sync_qt/qwebdav/QWebDAV.h
View file

@ -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* );