From d7c5a66cc8733037815fa13028c5a1f65646d48a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2023 14:55:48 +0100 Subject: [PATCH] Cover `folder/pullerrors` as well in option for deprecated routes --- connector/syncthingconnection.h | 1 + connector/syncthingconnection_requests.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/connector/syncthingconnection.h b/connector/syncthingconnection.h index 62461d7..08c8dc8 100644 --- a/connector/syncthingconnection.h +++ b/connector/syncthingconnection.h @@ -351,6 +351,7 @@ private Q_SLOTS: void recalculateStatus(); QString configPath() const; QByteArray changeConfigVerb() const; + QString folderErrorsPath() const; private: // internal helper methods diff --git a/connector/syncthingconnection_requests.cpp b/connector/syncthingconnection_requests.cpp index 3213079..6b6379b 100644 --- a/connector/syncthingconnection_requests.cpp +++ b/connector/syncthingconnection_requests.cpp @@ -224,6 +224,14 @@ QByteArray SyncthingConnection::changeConfigVerb() const return isUsingDeprecatedRoutes() ? QByteArray("POST") : QByteArray("PUT"); } +/*! + * \brief Returns the path to Syncthing's route to retrieve errors depending on whether deprecated routes should be used. + */ +QString SyncthingConnection::folderErrorsPath() const +{ + return isUsingDeprecatedRoutes() ? QStringLiteral("folder/pullerrors") : QStringLiteral("folder/errors"); +} + // pause/resume devices /*! @@ -1113,7 +1121,7 @@ void SyncthingConnection::requestDirPullErrors(const QString &dirId, int page, i query.addQueryItem(QStringLiteral("page"), QString::number(page)); query.addQueryItem(QStringLiteral("perpage"), QString::number(perPage)); } - auto *const reply = requestData(QStringLiteral("folder/pullerrors"), query); + auto *const reply = requestData(folderErrorsPath(), query); reply->setProperty("dirId", dirId); QObject::connect(reply, &QNetworkReply::finished, this, &SyncthingConnection::readDirPullErrors); }