feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Axivion: Simplify string constructions

Browse Source 
Change-Id: I6dfefbcba47486a16f793c46c281c7f0fb2e888d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2024-02-11 17:10:08 +01:00
parent 4cd5bdc4f6
commit e7670dd9db
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/axivion/axivionplugin.cpp
View File

@@ -266,8 +266,8 @@ static QUrl urlForProject(const QString &projectName)
} }
static constexpr int httpStatusCodeOk = 200; static constexpr int httpStatusCodeOk = 200;
static const QLatin1String jsonContentType{ "application/json" }; constexpr char s_htmlContentType[] = "text/html";
static const QLatin1String htmlContentType{ "text/html" }; constexpr char s_jsonContentType[] = "application/json";
static Group fetchHtmlRecipe(const QUrl &url, const std::function<void(const QByteArray &)> &handler) static Group fetchHtmlRecipe(const QUrl &url, const std::function<void(const QByteArray &)> &handler)
{ {
@@ -284,15 +284,11 @@ static Group fetchHtmlRecipe(const QUrl &url, const std::function<void(const QBy
const auto onQuerySetup = [storage, url](NetworkQuery &query) { const auto onQuerySetup = [storage, url](NetworkQuery &query) {
QNetworkRequest request(url); QNetworkRequest request(url);
request.setRawHeader(QByteArrayLiteral("Accept"), request.setRawHeader("Accept", s_htmlContentType);
QByteArray(htmlContentType.data(), htmlContentType.size())); request.setRawHeader("Authorization", storage->credentials);
request.setRawHeader(QByteArrayLiteral("Authorization"), const QByteArray ua = "Axivion" + QCoreApplication::applicationName().toUtf8() +
storage->credentials); "Plugin/" + QCoreApplication::applicationVersion().toUtf8();
const QByteArray ua = QByteArrayLiteral("Axivion") request.setRawHeader("X-Axivion-User-Agent", ua);
+ QCoreApplication::applicationName().toUtf8()
+ QByteArrayLiteral("Plugin/")
+ QCoreApplication::applicationVersion().toUtf8();
request.setRawHeader(QByteArrayLiteral("X-Axivion-User-Agent"), ua);
query.setRequest(request); query.setRequest(request);
query.setNetworkAccessManager(&dd->m_networkAccessManager); query.setNetworkAccessManager(&dd->m_networkAccessManager);
}; };
@@ -307,11 +303,10 @@ static Group fetchHtmlRecipe(const QUrl &url, const std::function<void(const QBy
.trimmed() .trimmed()
.toLower(); .toLower();
if (doneWith == DoneWith::Success && statusCode == httpStatusCodeOk if (doneWith == DoneWith::Success && statusCode == httpStatusCodeOk
&& contentType == htmlContentType) { && contentType == s_htmlContentType) {
handler(reply->readAll()); handler(reply->readAll());
return DoneResult::Success; return DoneResult::Success;
} }
return DoneResult::Error; return DoneResult::Error;
}; };
@@ -340,22 +335,19 @@ static Group fetchDataRecipe(const QUrl &url,
storage->credentials = QByteArrayLiteral("AxToken ") + settings().server.token.toUtf8(); storage->credentials = QByteArrayLiteral("AxToken ") + settings().server.token.toUtf8();
}; };
const auto onQuerySetup = [storage, url](NetworkQuery &query) { const auto onNetworkQuerySetup = [storage, url](NetworkQuery &query) {
QNetworkRequest request(url); QNetworkRequest request(url);
request.setRawHeader(QByteArrayLiteral("Accept"), request.setRawHeader("Accept", s_jsonContentType);
QByteArray(jsonContentType.data(), jsonContentType.size())); request.setRawHeader("Authorization", storage->credentials);
request.setRawHeader(QByteArrayLiteral("Authorization"), const QByteArray ua = "Axivion" + QCoreApplication::applicationName().toUtf8() +
storage->credentials); "Plugin/" + QCoreApplication::applicationVersion().toUtf8();
const QByteArray ua = QByteArrayLiteral("Axivion") request.setRawHeader("X-Axivion-User-Agent", ua);
+ QCoreApplication::applicationName().toUtf8()
+ QByteArrayLiteral("Plugin/")
+ QCoreApplication::applicationVersion().toUtf8();
request.setRawHeader(QByteArrayLiteral("X-Axivion-User-Agent"), ua);
query.setRequest(request); query.setRequest(request);
query.setNetworkAccessManager(&dd->m_networkAccessManager); query.setNetworkAccessManager(&dd->m_networkAccessManager);
return SetupResult::Continue;
}; };
const auto onQueryDone = [storage, url](const NetworkQuery &query, DoneWith doneWith) { const auto onNetworkQueryDone = [storage, url](const NetworkQuery &query, DoneWith doneWith) {
QNetworkReply *reply = query.reply(); QNetworkReply *reply = query.reply();
const QNetworkReply::NetworkError error = reply->error(); const QNetworkReply::NetworkError error = reply->error();
const int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); const int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@@ -366,13 +358,13 @@ static Group fetchDataRecipe(const QUrl &url,
.trimmed() .trimmed()
.toLower(); .toLower();
if (doneWith == DoneWith::Success && statusCode == httpStatusCodeOk if (doneWith == DoneWith::Success && statusCode == httpStatusCodeOk
&& contentType == jsonContentType) { && contentType == s_jsonContentType) {
storage->serializableData = reply->readAll(); storage->serializableData = reply->readAll();
return DoneResult::Success; return DoneResult::Success;
} }
const auto getError = [&]() -> Error { const auto getError = [&]() -> Error {
if (contentType == jsonContentType) { if (contentType == s_jsonContentType) {
try { try {
return DashboardError(reply->url(), statusCode, return DashboardError(reply->url(), statusCode,
reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(), reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(),
@@ -389,8 +381,7 @@ static Group fetchDataRecipe(const QUrl &url,
return NetworkError(reply->url(), error, reply->errorString()); return NetworkError(reply->url(), error, reply->errorString());
}; };
MessageManager::writeFlashing( MessageManager::writeFlashing(QStringLiteral("Axivion: %1").arg(getError().message()));
QStringLiteral("Axivion: %1").arg(getError().message()));
return DoneResult::Error; return DoneResult::Error;
}; };
@@ -411,7 +402,7 @@ static Group fetchDataRecipe(const QUrl &url,
const Group recipe { const Group recipe {
storage, storage,
Sync(onCredentialSetup), Sync(onCredentialSetup),
NetworkQueryTask(onQuerySetup, onQueryDone), NetworkQueryTask(onNetworkQuerySetup, onNetworkQueryDone),
AsyncTask<SerializableType>(onDeserializeSetup, onDeserializeDone) AsyncTask<SerializableType>(onDeserializeSetup, onDeserializeDone)
}; };