mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

blacklisting: disable broken remove stale entries function for now.

Browse Source
This commit is contained in:
Klaas Freitag 2014-10-03 11:35:18 +02:00
parent 6c2ce06fea
commit 41fa562dce
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mirall/owncloudpropagator.cpp
View File

@ -101,6 +101,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
if( _item._blacklistedInDb ) {
// wipe blacklist entry.
_propagator->_journal->wipeBlacklistEntry(_item._file);
// remove a blacklist entry in case the file was moved.
if( _item._originalFile != _item._file ) {
_propagator->_journal->wipeBlacklistEntry(_item._originalFile);
}
}
break;
case SyncFileItem::Conflict:

2
src/mirall/syncengine.cpp
View File

@ -706,7 +706,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
deleteStaleDownloadInfos();
deleteStaleUploadInfos();
deleteStaleBlacklistEntries();
// deleteStaleBlacklistEntries();
_journal->commit("post stale entry removal");
_propagator->start(_syncedItems);

4
src/mirall/syncjournaldb.cpp
View File

@ -921,6 +921,10 @@ int SyncJournalDb::wipeBlacklist()
void SyncJournalDb::wipeBlacklistEntry( const QString& file )
{
if( file.isEmpty() ) {
return;
}
QMutexLocker locker(&_mutex);
if( checkConnect() ) {
QSqlQuery query(_db);