chore: only ignore locked files when uploading them

fix behavior to match expectations from existing automated tests

ignoring locked files that would have been uploaded (i.e. not
downloaded)

ignoring locked files that have not match another ignore rule

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();
@@ -361,6 +354,14 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
         }
     }
 
+    if (excluded == CSYNC_NOT_EXCLUDED && OCC::FileSystem::isFileLocked(_discoveryData->_localDir + path, OCC::FileSystem::LockMode::SharedRead) &&
+        (!entries.dbEntry.isValid() || !entries.serverEntry.isValid() || entries.serverEntry.etag == entries.dbEntry._etag)) {
+        qCInfo(lcDisco) << _discoveryData->_localDir + path << "is locked" << "exluding it from sync";
+        excluded = CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED;
+
+        emit _discoveryData->seenLockedFile(_discoveryData->_localDir + path);
+    }
+
     if (excluded == CSYNC_NOT_EXCLUDED && !entries.localEntry.isSymLink) {
         return false;
     } else if (excluded == CSYNC_FILE_SILENTLY_EXCLUDED || excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
@@ -391,6 +392,9 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
         case CSYNC_FILE_EXCLUDE_AND_REMOVE:
             qCFatal(lcDisco) << "These were handled earlier";
             break;
+        case CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED:
+            item->_errorString = tr("File is locked by another application.");
+            break;
         case CSYNC_FILE_EXCLUDE_LIST:
             item->_errorString = tr("File is listed on the ignore list.");
             break;
@@ -2463,6 +2467,7 @@ bool ProcessDirectoryJob::maybeRenameForWindowsCompatibility(const QString &abso
     switch (excludeReason)
     {
     case CSYNC_NOT_EXCLUDED:
+    case CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED:
     case CSYNC_FILE_EXCLUDE_CASE_CLASH_CONFLICT:
     case CSYNC_FILE_EXCLUDE_AND_REMOVE:
     case CSYNC_FILE_EXCLUDE_CANNOT_ENCODE:

test/testlockedfiles.cpp

@@ -141,11 +141,11 @@ private slots:
 
         QVERIFY(seenLockedFiles.contains(fakeFolder.localPath() + "A/a1"));
         QVERIFY(seenLockedFiles.size() == 1);
-        QVERIFY(hasLocalDiscoveryPath("A/a1"));
+        QVERIFY(!hasLocalDiscoveryPath("A/a1"));
 
         CloseHandle(h1);
 
-        fakeFolder.syncEngine().setLocalDiscoveryOptions(LocalDiscoveryStyle::DatabaseAndFilesystem, tracker.localDiscoveryPaths());
+        fakeFolder.syncEngine().setLocalDiscoveryOptions(LocalDiscoveryStyle::DatabaseAndFilesystem, {"A/a1"});
         tracker.startSyncPartialDiscovery();
         QVERIFY(fakeFolder.syncOnce());
         QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());