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

Read Json error when possible

Browse Source
This commit is contained in:
Jonas Kvinge
2019-08-12 22:24:05 +02:00
parent 871bb391d6
commit 6374c77aa8
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lyrics/auddlyricsprovider.cpp
View File

@@ -21,14 +21,8 @@
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <QList>
#include <QPair>
#include <QMap>
#include <QSet>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QStringList>
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
@@ -42,7 +36,6 @@
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"
#include "core/utilities.h"
#include "jsonlyricsprovider.h" #include "jsonlyricsprovider.h"
#include "lyricsfetcher.h" #include "lyricsfetcher.h"
#include "auddlyricsprovider.h" #include "auddlyricsprovider.h"

7
src/lyrics/auddlyricsprovider.h
View File

@@ -25,15 +25,14 @@
#include <stdbool.h> #include <stdbool.h>
#include <QObject> #include <QObject>
#include <QHash>
#include <QMetaType>
#include <QString> #include <QString>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include "jsonlyricsprovider.h" #include "jsonlyricsprovider.h"
#include "lyricsfetcher.h" #include "lyricsfetcher.h"
class QNetworkAccessManager;
class QNetworkReply;
class AuddLyricsProvider : public JsonLyricsProvider { class AuddLyricsProvider : public JsonLyricsProvider {
Q_OBJECT Q_OBJECT

21
src/lyrics/jsonlyricsprovider.cpp
View File

@@ -35,19 +35,24 @@ JsonLyricsProvider::JsonLyricsProvider(const QString &name, QObject *parent) : L
QJsonObject JsonLyricsProvider::ExtractJsonObj(QNetworkReply *reply, const quint64 id) { QJsonObject JsonLyricsProvider::ExtractJsonObj(QNetworkReply *reply, const quint64 id) {
QString failure_reason;
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
QString failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
Error(id, failure_reason); if (reply->error() < 200) {
return QJsonObject(); Error(id, failure_reason);
return QJsonObject();
}
} }
else if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { failure_reason = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
QString failure_reason = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
Error(id, failure_reason);
return QJsonObject();
} }
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
if (data.isEmpty()) {
if (failure_reason.isEmpty()) failure_reason = "Empty reply received from server.";
Error(id, failure_reason);
return QJsonObject();
}
QJsonParseError error; QJsonParseError error;
QJsonDocument json_doc = QJsonDocument::fromJson(data, &error); QJsonDocument json_doc = QJsonDocument::fromJson(data, &error);