chore: fix automated test for locked files

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

Author: mgallien

src/csync/csync_exclude.h

@@ -37,6 +37,7 @@ enum CSYNC_EXCLUDE_TYPE {
   CSYNC_FILE_EXCLUDE_SERVER_BLACKLISTED,
   CSYNC_FILE_EXCLUDE_LEADING_SPACE,
   CSYNC_FILE_EXCLUDE_LEADING_AND_TRAILING_SPACE,
+  CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED,
 };
 
 class ExcludedFilesTest;

src/libsync/discovery.cpp

@@ -259,13 +259,6 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
 
     auto excluded = _discoveryData->_excludes->traversalPatternMatch(path, isDirectory ? ItemTypeDirectory : ItemTypeFile);
 
-    if (OCC::FileSystem::isFileLocked(_discoveryData->_localDir + path, OCC::FileSystem::LockMode::SharedRead)) {
-        qCInfo(lcDisco) << _discoveryData->_localDir + path << "is locked" << "exluding it from sync";
-        excluded = CSYNC_FILE_SILENTLY_EXCLUDED;
-
-        emit _discoveryData->seenLockedFile(path);
-    }
-
     const auto fileName = path.mid(path.lastIndexOf('/') + 1);
 
     const auto isLocal = entries.localEntry.isValid();
@@ -368,6 +361,13 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
         return true;
     }
 
+    if (excluded == CSYNC_NOT_EXCLUDED && OCC::FileSystem::isFileLocked(_discoveryData->_localDir + path, OCC::FileSystem::LockMode::SharedRead)) {
+        qCInfo(lcDisco) << _discoveryData->_localDir + path << "is locked" << "exluding it from sync";
+        excluded = CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED;
+
+        emit _discoveryData->seenLockedFile(_discoveryData->_localDir + path);
+    }
+
     auto item = SyncFileItemPtr::create();
     item->_file = path;
     item->_originalFile = path;