From 1fbae8c108080136d180554e79f70df5ae636a2c Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 12 May 2022 09:56:50 +0200 Subject: [PATCH] if an exclude file is deleted, skip it and remove it from internal list ignore files can be removed: not an error so adjust tests Signed-off-by: Matthieu Gallien --- src/csync/csync_exclude.cpp | 16 ++++++++++++++-- test/testexcludedfiles.cpp | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp index e367f37ddc534..4e9c9660df1cc 100644 --- a/src/csync/csync_exclude.cpp +++ b/src/csync/csync_exclude.cpp @@ -318,14 +318,26 @@ bool ExcludedFiles::reloadExcludeFiles() bool success = true; const auto keys = _excludeFiles.keys(); for (const auto& basePath : keys) { - for (const auto &excludeFile : _excludeFiles.value(basePath)) { + const auto itValue = _excludeFiles.find(basePath); + if (itValue == std::end(_excludeFiles)) { + continue; + } + auto &excludeFiles = *itValue; + for (auto excludeFileIt = std::begin(excludeFiles); excludeFileIt != std::end(excludeFiles); ) { + const auto &excludeFile = *excludeFileIt; QFile file(excludeFile); - if (file.exists() && file.open(QIODevice::ReadOnly)) { + if (!file.exists()) { + excludeFileIt = excludeFiles.erase(excludeFileIt); + continue; + } + + if (file.open(QIODevice::ReadOnly)) { loadExcludeFilePatterns(basePath, file); } else { success = false; qWarning() << "System exclude list file could not be opened:" << excludeFile; } + ++excludeFileIt; } } diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp index c044f5e599644..22fbf1fa74717 100644 --- a/test/testexcludedfiles.cpp +++ b/test/testexcludedfiles.cpp @@ -746,11 +746,11 @@ private slots: QCOMPARE(excludedFiles->_excludeFiles[folder2].first(), folder2ExcludeList); } - void testReloadExcludeFiles_fileDoesNotExist_returnFalse() { + void testReloadExcludeFiles_fileDoesNotExist_returnTrue() { excludedFiles.reset(new ExcludedFiles()); const QString nonExistingFile("directory/.sync-exclude.lst"); excludedFiles->addExcludeFilePath(nonExistingFile); - QCOMPARE(excludedFiles->reloadExcludeFiles(), false); + QCOMPARE(excludedFiles->reloadExcludeFiles(), true); QCOMPARE(excludedFiles->_allExcludes.size(), 0); }