From ddcee24a64328044629f45ff3163db83ea38d95f Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Fri, 5 Jul 2024 20:54:53 +0200 Subject: [PATCH] Simplify trailing and lead space check logic. Signed-off-by: Camila Ayres --- src/libsync/discovery.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index dab666be98bb3..1f5231a98e30f 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -259,7 +259,12 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent const auto fileName = path.mid(path.lastIndexOf('/') + 1); - if (excluded == CSYNC_NOT_EXCLUDED && Utility::isWindows()) { + // we don't need to trigger a warning if trailing/leading space file is already on the server or has already been synced down + // only if the OS supports trailing/leading spaces + const auto wasSyncedAlready = (entries.dbEntry.isValid() || entries.serverEntry.isValid()); + const auto isLeadingAndTrailingSpacesCheckRequired = Utility::isWindows() && !wasSyncedAlready; + const auto isLeadingAndTrailingSpacesFilesAllowed = _discoveryData->_leadingAndTrailingSpacesFilesAllowed.contains(_discoveryData->_localDir + path); + if (excluded == CSYNC_NOT_EXCLUDED && (isLeadingAndTrailingSpacesCheckRequired || isLeadingAndTrailingSpacesFilesAllowed)) { const auto endsWithSpace = fileName.endsWith(QLatin1Char(' ')); const auto startsWithSpace = fileName.startsWith(QLatin1Char(' ')); if (startsWithSpace && endsWithSpace) { @@ -271,14 +276,6 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent } } - // we don't need to trigger a warning if trailing/leading space file is already on the server or has already been synced down - // only if the OS supports trailing/leading spaces - const auto wasSyncedAlreadyAndOsSupportsSpaces = !Utility::isWindows() && (entries.serverEntry.isValid() || entries.dbEntry.isValid()); - if ((excluded == CSYNC_FILE_EXCLUDE_LEADING_SPACE || excluded == CSYNC_FILE_EXCLUDE_TRAILING_SPACE || excluded == CSYNC_FILE_EXCLUDE_LEADING_AND_TRAILING_SPACE) - && (wasSyncedAlreadyAndOsSupportsSpaces || _discoveryData->_leadingAndTrailingSpacesFilesAllowed.contains(_discoveryData->_localDir + path))) { - excluded = CSYNC_NOT_EXCLUDED; - } - // FIXME: move to ExcludedFiles 's regexp ? bool isInvalidPattern = false; if (excluded == CSYNC_NOT_EXCLUDED && !_discoveryData->_invalidFilenameRx.pattern().isEmpty()) {