fix: SonarCloud quality gate issues

src/gui/folder.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "common/syncjournaldb.h"
 #include "config.h"
 
 #include "account.h"
@@ -251,7 +251,7 @@
 
 QString Folder::shortGuiRemotePathOrAppName() const
 {
     if (remotePath().length() > 0 && remotePath() != QLatin1String("/")) {
         QString a = QFile(remotePath()).fileName();
         if (a.startsWith('/')) {
             a = a.remove(0, 1);
@@ -337,7 +337,7 @@
     return Utility::trailingSlashPath(remotePath());
 }
 
 QString Folder::fulllRemotePathToPathInSyncJournalDb(const QString &fullRemotePath) const
 {
     return Utility::fullRemotePathToRemoteSyncRootRelative(fullRemotePath, remotePathTrailingSlash());
 }
@@ -444,7 +444,7 @@
     _lastEtag = etag;
 }
 
 void Folder::rootFileIdReceivedFromSyncEngine(const qint64 fileId)
 {
     qCDebug(lcFolder).nospace() << "retrieved root fileId=" << fileId;
     _rootFileId = fileId;
@@ -570,7 +570,7 @@
     Q_ASSERT(_vfs->mode() == _definition.virtualFilesMode);
 
     const auto result = Vfs::checkAvailability(path(), _vfs->mode());
     if (!result) {
         _syncResult.appendErrorString(result.error());
         _syncResult.setStatus(SyncResult::SetupError);
         return;
@@ -627,7 +627,7 @@
         qCInfo(lcFolder) << "Deleting temporary file: " << tmppath;
         FileSystem::remove(tmppath);
     }
     return deleted_infos.size();
 }
 
 int Folder::downloadInfoCount()
@@ -645,20 +645,20 @@
     return _journal.wipeErrorBlacklist();
 }
 
 void Folder::slotWatchedPathChanged(const QStringView &path, const ChangeReason reason)
 {
     if (!path.startsWith(this->path())) {
         qCDebug(lcFolder) << "Changed path is not contained in folder, ignoring:" << path;
         return;
     }
 
     auto relativePath = path.mid(this->path().size());
 
     if (_vfs) {
         if (pathIsIgnored(path.toString())) {
             const auto pinState = _vfs->pinState(relativePath.toString());
             if ((!pinState || *pinState != PinState::Excluded) && FileSystem::fileExists(relativePath.toString())) {
                 if (!_vfs->setPinState(relativePath.toString(), PinState::Excluded)) {
                     qCWarning(lcFolder) << "Could not set pin state of" << relativePath << "to excluded";
                 }
             }
@@ -666,7 +666,7 @@
         } else {
             const auto pinState = _vfs->pinState(relativePath.toString());
             if (pinState && *pinState == PinState::Excluded) {
                 if (!_vfs->setPinState(relativePath.toString(), PinState::Inherited)) {
                     qCWarning(lcFolder) << "Could not switch pin state of" << relativePath << "from" << *pinState << "to inherited";
                 }
             }
@@ -709,13 +709,13 @@
             spurious = true;
             if (auto pinState = _vfs->pinState(relativePath.toString())) {
                 qCDebug(lcFolder) << "PinState for" << relativePath << "is" << *pinState;
                 if (*pinState == PinState::Unspecified) {
                     spurious = false;
                 }
                 if (*pinState == PinState::AlwaysLocal && record.isVirtualFile()) {
                     spurious = false;
                 }
                 if (*pinState == PinState::OnlineOnly && record.isFile()) {
                     spurious = false;
                 }
             } else {
@@ -947,13 +947,13 @@
     removeFromSettings();
 
     auto settings = _accountState->settings();
     QString settingsGroup = QStringLiteral("Multifolders");
 
     // True if the folder path appears in only one account
     const auto folderMap = FolderMan::instance()->map();
     const auto oneAccountOnly = std::none_of(folderMap.cbegin(), folderMap.cend(), [this](const auto *other) {
         return other != this && other->cleanPath() == this->cleanPath();
     });
 
     if (virtualFilesEnabled() || _saveInFoldersWithPlaceholders) {
         // If virtual files are enabled or even were enabled at some point,
@@ -1010,7 +1010,7 @@
     return false;
 }
 
 void Folder::appendPathToSelectiveSyncList(const QString &path, const SyncJournalDb::SelectiveSyncListType listType)
 {
     const auto folderPath = Utility::trailingSlashPath(path);
     const auto journal = journalDb();
@@ -1023,7 +1023,7 @@
     }
 }
 
 void Folder::removePathFromSelectiveSyncList(const QString &path, const SyncJournalDb::SelectiveSyncListType listType)
 {
     const auto folderPath = Utility::trailingSlashPath(path);
     const auto journal = journalDb();
@@ -1063,7 +1063,7 @@
     return fileIds.contains(_rootFileId) || journalDb()->hasFileIds(fileIds);
 }
 
 QString Folder::filePath(const QString& fileName)
 {
     const auto folderDir = QDir(_canonicalLocalPath);
 
@@ -1217,7 +1217,7 @@
     }
 
     _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);
-    _engine->setFilesystemPermissionsReliable(_folderWatcher->canSetPermissions());
+    _engine->setFilesystemPermsReliable(_folderWatcher->canSetPermissions());
 
     correctPlaceholderFiles();
 
@@ -1246,7 +1246,7 @@
     ConfigFile cfgFile;
     const auto account = _accountState->account();
 
     auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
     opt._newBigFolderSizeLimit = newFolderLimit.first ? newFolderLimit.second * 1000LL * 1000LL : -1; // convert from MB to B
     opt._confirmExternalStorage = cfgFile.confirmExternalStorage();
     opt._moveFilesToTrash = cfgFile.moveToTrash();
@@ -1255,7 +1255,7 @@
     const auto capsMaxConcurrentChunkUploads = account->capabilities().maxConcurrentChunkUploads();
     opt._parallelNetworkJobs = capsMaxConcurrentChunkUploads > 0
         ? capsMaxConcurrentChunkUploads
         : account->isHttp2Supported() ? 20 : 6;
 
     // Chunk V2: Size of chunks must be between 5MB and 5GB, except for the last chunk which can be smaller
     const auto cfgMinChunkSize = cfgFile.minChunkSize();
@@ -1603,7 +1603,7 @@
 
     // If the number of conflicts is too low, adjust it upwards
     if (conflictPaths.size() > r.numNewConflictItems() + r.numOldConflictItems())
         r.setNumOldConflictItems(conflictPaths.size() - r.numNewConflictItems());
 }
 
 void Folder::warnOnNewExcludedItem(const SyncJournalFileRecord &record, const QStringView &path)
@@ -1631,7 +1631,7 @@
         return;
     }
 
     QFileInfo excludeItemFileInfo(fullPath);
     const auto excludeItemFilePath = excludeItemFileInfo.filePath();
     const auto message = FileSystem::isDir(fullPath)
         ? tr("The folder %1 was created but was excluded from synchronization previously. "
@@ -1658,21 +1658,21 @@
     Logger::instance()->postGuiLog(Theme::instance()->appNameGUI(), fullMessage);
 }
 
 void Folder::slotHydrationStarts()
 {
     // // Abort any running full sync run and reschedule
     // if (_engine->isSyncRunning()) {
     //     setSilenceErrorsUntilNextSync(true);
     //     slotTerminateSync();
     //     scheduleThisFolderSoon();
     //     // TODO: This sets the sync state to AbortRequested on done, we don't want that
     // }
 
     // // Let everyone know we're syncing
     // _syncResult.reset();
     // _syncResult.setStatus(SyncResult::SyncRunning);
     // emit syncStarted();
     // emit syncStateChange();
 }
 
 void Folder::slotHydrationDone()
@@ -1683,7 +1683,7 @@
     emit syncStateChange();
 }
 
 void Folder::slotHydrationFailed(int errorCode, int statusCode, const QString &errorString, const QString &fileName)
 {
     _syncResult.setStatus(SyncResult::Error);
     const auto errorMessageDetails = tr("Virtual file download failed with code \"%1\", status \"%2\" and error message \"%3\"")
@@ -1692,7 +1692,7 @@
         .arg(errorString);
     _syncResult.appendErrorString(errorMessageDetails);
 
     const auto errorMessageBox = new VfsDownloadErrorDialog(fileName, errorMessageDetails);
     errorMessageBox->setAttribute(Qt::WA_DeleteOnClose);
     errorMessageBox->show();
     errorMessageBox->activateWindow();
@@ -1782,13 +1782,13 @@
     const auto isDownDirection = (dir == SyncFileItem::Down);
     const QString msg = isDownDirection ? tr("A large number of files in the server have been deleted.\nPlease confirm if you'd like to proceed with these deletions.\nAlternatively, you can restore all deleted files by uploading from '%1' folder to the server.")
                                         : tr("A large number of files in your local '%1' folder have been deleted.\nPlease confirm if you'd like to proceed with these deletions.\nAlternatively, you can restore all deleted files by downloading them from the server.");
     auto msgBox = new QMessageBox(QMessageBox::Warning, tr("Remove all files?"),
                                   msg.arg(shortGuiLocalPath()), QMessageBox::NoButton);
     msgBox->setAttribute(Qt::WA_DeleteOnClose);
     msgBox->setWindowFlags(msgBox->windowFlags() | Qt::WindowStaysOnTopHint);
     msgBox->addButton(tr("Proceed with Deletion"), QMessageBox::DestructiveRole);
     QPushButton *keepBtn = msgBox->addButton(isDownDirection ? tr("Restore Files to Server") : tr("Restore Files from Server"),
                                              QMessageBox::AcceptRole);
     bool oldPaused = syncPaused();
     setSyncPaused(true);
     connect(msgBox, &QMessageBox::finished, this, [msgBox, keepBtn, callback, oldPaused, this] {

src/libsync/discovery.h

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 ownCloud GmbH
@@ -6,7 +6,7 @@
 
 #pragma once
 
 #include <QObject>
 #include <cstdint>
 #include "csync_exclude.h"
 #include "discoveryphase.h"
@@ -39,7 +39,7 @@
  *
  * Results are fed outwards via the DiscoveryPhase::itemDiscovered() signal.
  */
 class ProcessDirectoryJob : public QObject
 {
     Q_OBJECT
 
@@ -103,7 +103,7 @@
         ProcessDirectoryJob *parent);
 
     explicit ProcessDirectoryJob(DiscoveryPhase *data, PinState basePinState, const PathTuple &path, const SyncFileItemPtr &dirItem, const SyncFileItemPtr &parentDirItem,
-                                 QueryMode queryLocal, qint64 lastSyncTimestamp, QObject *parent);
+                                 const QueryMode queryLocal, qint64 lastSyncTimestamp, QObject *parent);
 
     void start();
     /** Start up to nbJobs, return the number of job started; emit finished() when done */
@@ -204,6 +204,8 @@
      */
     MovePermissionResult checkMovePermissions(RemotePermissions srcPerm, const QString &srcPath, bool isDirectory);
 
+    void updateDirItemFromServerJob(const DiscoverySingleDirectoryJob *const serverJob);
+    void applyE2eeEncryptForLocalNew(const SyncFileItemPtr &item, const SyncJournalFileRecord &base) const;
     void processBlacklisted(const PathTuple &, const LocalInfo &, const SyncJournalFileRecord &dbEntry);
     void subJobFinished();
 
@@ -249,8 +251,8 @@
      */
     void setupDbPinStateActions(SyncJournalFileRecord &record);
 
-    bool maybeRenameForWindowsCompatibility(const QString &absoluteFileName,
-                                            CSYNC_EXCLUDE_TYPE excludeReason);
+    bool maybeRenameForWinCompatibility(const QString &absoluteFileName,
+                                            const CSYNC_EXCLUDE_TYPE excludeReason) const;
 
     [[nodiscard]] bool checkNewDeleteConflict(const SyncFileItemPtr &item) const;
 

src/libsync/discoveryphase.h

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -113,9 +113,9 @@
     explicit DiscoverySingleDirectoryJob(const AccountPtr &account,
                                          const QString &path,
                                          const QString &remoteRootFolderPath,
-        /* TODO for topLevelE2eeFolderPaths, from review: I still do not get why giving the whole QSet instead of just the parent of the folder we are in
-        sounds to me like it would be much more efficient to just have the e2ee parent folder that we are
-        inside*/
+        // TODO for topLevelE2eeFolderPaths, from review: I still do not get why giving the whole QSet instead of just the parent of the folder we are in
+        // sounds to me like it would be much more efficient to just have the e2ee parent folder that we are
+        // inside
                                          const QSet<QString> &topLevelE2eeFolderPaths,
                                          SyncFileItem::EncryptionStatus parentEncryptionStatus,
                                          QObject *parent = nullptr);
@@ -295,8 +295,8 @@
     ExcludedFiles *_excludes = nullptr;
     QRegularExpression _invalidFilenameRx; // FIXME: maybe move in ExcludedFiles
     QStringList _serverBlacklistedFiles; // The blacklist from the capabilities
-    QStringList _leadingAndTrailingSpacesFilesAllowed;
-    bool _shouldEnforceWindowsFileNameCompatibility = false;
+    QStringList _spacesFilesAllowed;
+    bool _enforceWindowsFilenameCompat = false;
     bool _ignoreHiddenFiles = false;
     std::function<bool(const QString &)> _shouldDiscoverLocaly;
 

src/libsync/propagateupload.cpp

@@ -1,10 +1,10 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
 #include "propagateupload.h"
 #include "propagateuploadencrypted.h"
 #include "owncloudpropagator_p.h"
@@ -71,7 +71,7 @@
         qCWarning(lcPutJob) << " Network error: " << reply()->errorString();
     }
 
-    connect(reply(), &QNetworkReply::uploadProgress, this, [requestID] (qint64 bytesSent, qint64 bytesTotal) {
+    connect(reply(), &QNetworkReply::uploadProgress, this, [requestID] (const qint64 bytesSent, const qint64 bytesTotal) {
         qCDebug(lcPutJob()) << requestID << "upload progress" << bytesSent << bytesTotal;
     });
 
@@ -114,9 +114,9 @@
         _item->_requestId = requestId();
         _item->_status = classifyError(err, _item->_httpErrorCode);
         _item->_errorString = errorString();
-        const auto exceptionParsed = getExceptionFromReply(reply());
-        _item->_errorExceptionName = exceptionParsed.first;
-        _item->_errorExceptionMessage = exceptionParsed.second;
+        const auto [exceptionName, exceptionMessage] = getExceptionFromReply(reply());
+        _item->_errorExceptionName = exceptionName;
+        _item->_errorExceptionMessage = exceptionMessage;
 
         if (_item->_status == SyncFileItem::FatalError || _item->_httpErrorCode >= 400) {
             if (_item->_status != SyncFileItem::FatalError
@@ -158,10 +158,8 @@
         _item->_status = SyncFileItem::Success;
         _item->_fileId = json["fileId"].toString().toUtf8();
 
-        if (SyncJournalFileRecord oldRecord; _journal->getFileRecord(_item->destination(), &oldRecord) && oldRecord.isValid()) {
-            if (oldRecord._etag != _item->_etag) {
-                _item->updateLockStateFromDbRecord(oldRecord);
-            }
+        if (SyncJournalFileRecord oldRecord; _journal->getFileRecord(_item->destination(), &oldRecord) && oldRecord.isValid() && oldRecord._etag != _item->_etag) {
+            _item->updateLockStateFromDbRecord(oldRecord);
         }
 
         _item->_etag = parseEtag(json["ETag"].toString().toUtf8());
@@ -182,9 +180,6 @@
 
 PropagateUploadFileCommon::PropagateUploadFileCommon(OwncloudPropagator *propagator, const SyncFileItemPtr &item)
     : PropagateItemJob(propagator, item)
-    , _finished(false)
-    , _deleteExisting(false)
-    , _aborting(false)
 {
     const auto path = _item->_file;
     const auto slashPosition = path.lastIndexOf('/');
@@ -741,15 +736,15 @@
 
     job->setTimeout(qBound(
         // Calculate 3 minutes for each gigabyte of data
-        qMin(thirtyMinutes - 1, qRound64(threeMinutes * fileSize / 1e9)),
+        qMin(thirtyMinutes - 1, qRound64(threeMinutes * static_cast<double>(fileSize) / 1e9)),
         job->timeoutMsec(),
         // Maximum of 30 minutes
         thirtyMinutes));
 }
 
 void PropagateUploadFileCommon::slotJobDestroyed(QObject *job)
 {
-    _jobs.erase(std::remove(_jobs.begin(), _jobs.end(), job), _jobs.end());
+    _jobs.erase(std::ranges::remove(_jobs, job).begin(), _jobs.end());
 }
 
 // This function is used whenever there is an error occurring and jobs might be in progress

src/libsync/propagateupload.h

@@ -204,15 +204,15 @@
 
 protected:
     QVector<AbstractNetworkJob *> _jobs; /// network jobs that are currently in transit
-    bool _finished BITFIELD(1); /// Tells that all the jobs have been finished
-    bool _deleteExisting BITFIELD(1);
+    bool _finished BITFIELD(1) = false; /// Tells that all the jobs have been finished
+    bool _deleteExisting BITFIELD(1) = false;
 
     /** Whether an abort is currently ongoing.
      *
      * Important to avoid duplicate aborts since each finishing PUTFileJob might
      * trigger an abort on error.
      */
-    bool _aborting BITFIELD(1);
+    bool _aborting BITFIELD(1) = false;
 
     /* This is a minified version of the SyncFileItem,
      * that holds only the specifics about the file that's
@@ -273,7 +273,7 @@
     void slotPollFinished();
 
 protected:
     void done(const SyncFileItem::Status status, const QString &errorString = QString(), const ErrorCategory category = ErrorCategory::NoError) override;
 
     /**
      * Aborts all running network jobs, except for the ones that mayAbortJob