fix(lockedFiles): try to silently ignore locked files

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

Author: mgallien

src/csync/csync_exclude.cpp

@@ -27,6 +27,9 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QVariant>
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(lcCsyncExclude, "nextcloud.csync.exclude", QtInfoMsg)
 
 /** Expands C-like escape sequences (in place)
  */
@@ -163,10 +166,16 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(const QString &path, bool exclu
     // not allow to sync those to avoid file loss/ambiguities (#416)
     if (blen > 1) {
         if (bname.at(blen - 1) == QLatin1Char('.')) {
+
             return CSYNC_FILE_EXCLUDE_INVALID_CHAR;
         }
     }
 
+    if (OCC::FileSystem::isFileLocked(path, OCC::FileSystem::LockMode::SharedRead)) {
+        qCWarning(lcCsyncExclude) << path << "is locked" << "exluding it from sync";
+        return CSYNC_FILE_LOCKED_SILENTLY_EXCLUDED;
+    }
+
     if (csync_is_windows_reserved_word(bname)) {
         return CSYNC_FILE_SILENTLY_EXCLUDED;
     }

src/gui/folder.cpp

@@ -1001,6 +1001,11 @@ bool Folder::pathIsIgnored(const QString &path) const
         return true;
     }
 
+    if (OCC::FileSystem::isFileLocked(path, OCC::FileSystem::LockMode::SharedRead)) {
+        qCDebug(lcFolder) << path << "is locked" << "skip syncing it";
+        return true;
+    }
+
 #ifndef OWNCLOUD_TEST
     if (isFileExcludedAbsolute(path) && !Utility::isConflictFile(path)) {
         qCDebug(lcFolder) << "* Ignoring file" << path;

src/libsync/discovery.cpp

@@ -259,6 +259,11 @@ 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;
+    }
+
     const auto fileName = path.mid(path.lastIndexOf('/') + 1);
 
     const auto isLocal = entries.localEntry.isValid();

test/testlockedfiles.cpp

@@ -137,7 +137,7 @@ private slots:
 
         fakeFolder.syncEngine().setLocalDiscoveryOptions(LocalDiscoveryStyle::DatabaseAndFilesystem, tracker.localDiscoveryPaths());
         tracker.startSyncPartialDiscovery();
-        QVERIFY(!fakeFolder.syncOnce());
+        QVERIFY(fakeFolder.syncOnce());
 
         QVERIFY(seenLockedFiles.contains(fakeFolder.localPath() + "A/a1"));
         QVERIFY(seenLockedFiles.size() == 1);