libsync: Add symlink type to DiscoveryPhase

nextcloud · Nov 23, 2023 · 4719069 · 4719069
1 parent 8dd614d
commit 4719069
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -711,7 +711,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(const SyncFileItemPtr &it
             _discoveryData->checkSelectiveSyncExistingFolder(path._server);
         }
 
-        if (serverEntry.isDirectory != dbEntry.isDirectory()) {
+        if (serverEntry.isSymLink != dbEntry.isSymLink() || serverEntry.isDirectory != dbEntry.isDirectory()) {
             // If the type of the entity changed, it's like NEW, but
             // needs to delete the other entity first.
             item->_instruction = CSYNC_INSTRUCTION_TYPE_CHANGE;

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
@@ -442,6 +442,7 @@ static void propertyMapToRemoteInfo(const QMap<QString, QString> &map, RemoteInf
         QString value = it.value();
         if (property == QLatin1String("resourcetype")) {
             result.isDirectory = value.contains(QLatin1String("collection"));
+            result.isSymLink = value.contains(QLatin1String("symlink"));
         } else if (property == QLatin1String("getlastmodified")) {
             const auto date = QDateTime::fromString(value, Qt::RFC2822Date);
             Q_ASSERT(date.isValid());

diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h
@@ -68,6 +68,7 @@ struct RemoteInfo
     int64_t size = 0;
     int64_t sizeOfFolder = 0;
     bool isDirectory = false;
+    bool isSymLink = false;
     bool _isE2eEncrypted = false;
     bool isFileDropDetected = false;
     QString e2eMangledName;