dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle missing HTTP status code

Browse Source
This commit is contained in:
Jonas Kvinge
2024-12-07 14:02:59 +01:00
parent e1afe03d51
commit fd427dac29
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -237,11 +237,17 @@ ListenBrainzScrobbler::ReplyResult ListenBrainzScrobbler::GetJsonObject(QNetwork
ReplyResult reply_error_type = ReplyResult::ServerError; ReplyResult reply_error_type = ReplyResult::ServerError;
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
if (!reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isValid() || reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isValid()) {
reply_error_type = ReplyResult::Success; const int http_status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (http_status_code == 200) {
reply_error_type = ReplyResult::Success;
}
else {
error_description = QStringLiteral("Received HTTP code %1").arg(http_status_code);
}
} }
else { else {
error_description = QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()); error_description = u"Missing HTTP status code"_s;
} }
} }
else { else {

12
src/scrobbler/scrobblingapi20.cpp
View File

@@ -158,11 +158,17 @@ ScrobblingAPI20::ReplyResult ScrobblingAPI20::GetJsonObject(QNetworkReply *reply
ReplyResult reply_error_type = ReplyResult::ServerError; ReplyResult reply_error_type = ReplyResult::ServerError;
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
if (!reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isValid() || reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isValid()) {
reply_error_type = ReplyResult::Success; const int http_status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (http_status_code == 200) {
reply_error_type = ReplyResult::Success;
}
else {
error_description = QStringLiteral("Received HTTP code %1").arg(http_status_code);
}
} }
else { else {
error_description = QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()); error_description = u"Missing HTTP status code"_s;
} }
} }
else { else {