fix(exclude): avoid trying to read patterns from file when reading failed

src/csync/csync_exclude.cpp

@@ -1,3 +1,3 @@
 /*
  * libcsync -- a library to sync a directory with another
  *
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "config_csync.h"
 #include <qglobal.h>
 
 #ifndef _GNU_SOURCE
@@ -84,7 +84,7 @@
  * @param file_name filename
  * @return true if file is reserved, false otherwise
  */
 OCSYNC_EXPORT bool csync_is_windows_reserved_word(const QStringView &filename)
 {
     size_t len_filename = filename.size();
 
@@ -127,7 +127,7 @@
 {
     /* split up the path */
     QStringView bname(path);
     int lastSlash = bname.lastIndexOf(QLatin1Char('/'));
     if (lastSlash >= 0) {
         bname = bname.mid(lastSlash + 1);
     }
@@ -204,7 +204,7 @@
 
     /* Do not sync desktop.ini files anywhere in the tree. */
     const auto desktopIniFile = QStringLiteral("desktop.ini");
     if (blen == static_cast<qsizetype>(desktopIniFile.length()) && bname.compare(desktopIniFile, Qt::CaseInsensitive) == 0) {
         return CSYNC_FILE_SILENTLY_EXCLUDED;
     }
 
@@ -250,7 +250,7 @@
                                                                     ? _localPath
                                                                     : leftIncludeLast(path, QLatin1Char('/'));
     auto &excludeFilesLocalPath = _excludeFiles[basePath];
     if (std::find(excludeFilesLocalPath.cbegin(), excludeFilesLocalPath.cend(), path) == excludeFilesLocalPath.cend()) {
         excludeFilesLocalPath.append(path);
     }
 }
@@ -270,11 +270,11 @@
     Q_ASSERT(basePath.endsWith(QLatin1Char('/')));
 
     const auto trimmedExpr = QStringView{expr}.trimmed();
     if (trimmedExpr == QLatin1String("*")) {
         return;
     }
 
     auto key = basePath;
     _manualExcludes[key].append(expr);
     _allExcludes[key].append(expr);
     prepare(key);
@@ -302,14 +302,25 @@
     QStringList patterns;
     while (!file.atEnd()) {
         QByteArray line = file.readLine().trimmed();
+        if (file.error()) {
+            // e.g. "Access to the cloud file is denied." when the exclude list is dehydrated on a VFS-enabled sync folder
+            qCWarning(lcCsyncExclude).nospace() << "failed to load exclude patterns from file, assume empty ignore list"
+                << " fileName=" << file.fileName()
+                << " error=" << file.error()
+                << " errorString=" << file.errorString();
+            break;
+        }
+
         if (line.startsWith("#!version")) {
-            if (!versionDirectiveKeepNextLine(line))
+            if (!versionDirectiveKeepNextLine(line)) {
                 file.readLine();
+            }
         }
-        if (line.isEmpty() || line.startsWith('#'))
+        if (line.isEmpty() || line.startsWith('#')) {
             continue;
+        }
         const auto patternStr = QString::fromUtf8(line);
         if (QStringView{patternStr}.trimmed() == QLatin1StringView("*")) {
             continue;
         }
         csync_exclude_expand_escapes(line);
@@ -461,7 +472,7 @@
     // Check the bname part of the path to see whether the full
     // regex should be run.
     QStringView bnameStr(path);
     int lastSlash = path.lastIndexOf(QLatin1Char('/'));
     if (lastSlash >= 0) {
         bnameStr = bnameStr.mid(lastSlash + 1);
     }
@@ -668,7 +679,7 @@
     auto isWildcard = [](QChar c) { return c == QLatin1Char('*') || c == QLatin1Char('?'); };
 
     // First, skip wildcards on the very right of the pattern
     int i = pattern.size() - 1;
     while (i >= 0 && isWildcard(pattern[i]))
         --i;
 

src/libsync/vfs/cfapi/vfs_cfapi.cpp

@@ -553,7 +553,9 @@ int VfsCfApi::finalizeNewPlaceholders(const QList<PlaceholderCreateInfo> &newEnt
         folderRecord._isShared = entryInfo.parsedProperties.remotePerm.hasPermission(RemotePermissions::IsShared) || entryInfo.parsedProperties.sharedByMe;
         folderRecord._sharedByMe = entryInfo.parsedProperties.sharedByMe;
         folderRecord._lastShareStateFetchedTimestamp = QDateTime::currentMSecsSinceEpoch();
-        folderRecord._type = (entryInfo.parsedProperties.isDirectory ? ItemTypeVirtualDirectory : ItemTypeVirtualFile);
+        folderRecord._type =
+            (entryInfo.parsedProperties.isDirectory ? ItemTypeVirtualDirectory
+                                                    : (FileSystem::isExcludeFile(entryInfo.fullPath) ? ItemTypeVirtualFileDownload : ItemTypeVirtualFile));
         folderRecord._etag = entryInfo.parsedProperties.etag;
         folderRecord._e2eEncryptionStatus = static_cast<SyncJournalFileRecord::EncryptionStatus>(entryInfo.parsedProperties.isE2eEncrypted() ? SyncFileItem::EncryptionStatus::EncryptedMigratedV2_0 : SyncFileItem::EncryptionStatus::NotEncrypted);
         folderRecord._lockstate._locked = (entryInfo.parsedProperties.locked == SyncFileItemEnums::LockStatus::LockedItem);