From: Felix Weilbach <felix.weilbach@nextcloud.com>
Date: Thu, 4 Nov 2021 14:09:17 +0000 (+0100)
Subject: Don't convert exclude file to placeholder file
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~18^2~122^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=650578ee6429ba3d65972061fdbcc4a1d325abf9;p=nextcloud-desktop.git

Don't convert exclude file to placeholder file

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
---

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 47f24f832..25a2826bb 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -15,6 +15,7 @@
 
 #include "syncengine.h"
 #include "account.h"
+#include "common/filesystembase.h"
 #include "owncloudpropagator.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
@@ -53,6 +54,7 @@
 #include <QSslCertificate>
 #include <QProcess>
 #include <QElapsedTimer>
+#include <QFileInfo>
 #include <qtextcodec.h>
 
 namespace OCC {
@@ -1023,9 +1025,17 @@ void SyncEngine::switchToVirtualFiles(const QString &localPath, SyncJournalDb &j
 {
     qCInfo(lcEngine) << "Convert to virtual files inside" << localPath;
     journal.getFilesBelowPath({}, [&](const SyncJournalFileRecord &rec) {
+        const auto path = rec.path();
+        const auto fileName = QFileInfo(path).fileName();
+        if (FileSystem::isExcludeFile(fileName)) {
+            return;
+        }
         SyncFileItem item;
-        QString localFile = localPath + rec.path();
-        vfs.convertToPlaceholder(localFile, item, localFile);
+        QString localFile = localPath + path;
+        const auto result = vfs.convertToPlaceholder(localFile, item, localFile);
+        if (!result.isValid()) {
+            qCWarning(lcEngine) << "Could not convert file to placeholder" << result.error();
+        }
     });
 }