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

Don't show the "All files deleted" popup when unselecting everything with selective sync

Browse Source 
Issue #7337
This commit is contained in:
Olivier Goffart 2019-10-16 12:12:02 +02:00 committed by Markus Goetz
parent a698d8b4ae
commit ba99c38d19
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsync/discovery.cpp
View File

@ -1157,6 +1157,7 @@ void ProcessDirectoryJob::processBlacklisted(const PathTuple &path, const OCC::L
item->_file = path._target;
item->_originalFile = path._original;
item->_inode = localEntry.inode;
item->_isSelectiveSync = true;
if (dbEntry.isValid() && ((dbEntry._modtime == localEntry.modtime && dbEntry._fileSize == localEntry.size) || (localEntry.isDirectory && dbEntry.isDirectory()))) {
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Down;

2
src/libsync/syncengine.cpp
View File

@ -375,7 +375,7 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
item->_status = SyncFileItem::Conflict;
}
return;
} else if (item->_instruction == CSYNC_INSTRUCTION_REMOVE) {
} else if (item->_instruction == CSYNC_INSTRUCTION_REMOVE && !item->_isSelectiveSync) {
_hasRemoveFile = true;
} else if (item->_instruction == CSYNC_INSTRUCTION_RENAME) {
_hasNoneFiles = true; // If a file (or every file) has been renamed, it means not al files where deleted

2
src/libsync/syncfileitem.h
View File

@ -105,6 +105,7 @@ public:
, _errorMayBeBlacklisted(false)
, _status(NoStatus)
, _isRestoration(false)
, _isSelectiveSync(false)
, _httpErrorCode(0)
, _affectedItems(1)
, _instruction(CSYNC_INSTRUCTION_NONE)
@ -241,6 +242,7 @@ public:
// Variables useful to report to the user
Status _status BITFIELD(4);
bool _isRestoration BITFIELD(1); // The original operation was forbidden, and this is a restoration
bool _isSelectiveSync BITFIELD(1); // The file is removed or ignored because it is in the selective sync list
quint16 _httpErrorCode;
RemotePermissions _remotePerm;
QString _errorString; // Contains a string only in case of error

26
test/testallfilesdeleted.cpp
View File

@ -295,6 +295,32 @@ private slots:
QCOMPARE(aboutToRemoveAllFilesCalled, 0);
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
}
void testSelectiveSyncNoPopup() {
// Unselecting all folder should not cause the popup to be shown
FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
int aboutToRemoveAllFilesCalled = 0;
QObject::connect(&fakeFolder.syncEngine(), &SyncEngine::aboutToRemoveAllFiles,
[&](SyncFileItem::Direction , bool *) {
aboutToRemoveAllFilesCalled++;
QFAIL("should not be called");
});
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(aboutToRemoveAllFilesCalled, 0);
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
QStringList() << "A/" << "B/" << "C/" << "S/");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), FileInfo{}); // all files should be one localy
QCOMPARE(fakeFolder.currentRemoteState(), FileInfo::A12_B12_C12_S12()); // Server not changed
QCOMPARE(aboutToRemoveAllFilesCalled, 0); // But we did not show the popup
}
};
QTEST_GUILESS_MAIN(TestAllFilesDeleted)