From dfecd0cd121199833fef943e44e70c134a8e6749 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 10 May 2020 12:48:48 +0200 Subject: [PATCH] Show Json parse error --- src/lyrics/geniuslyricsprovider.cpp | 4 ++-- src/lyrics/jsonlyricsprovider.cpp | 8 ++++---- src/lyrics/lololyricsprovider.cpp | 4 +--- src/lyrics/musixmatchlyricsprovider.cpp | 8 +++----- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index f3eb9ecc8..91f745f4f 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/src/lyrics/geniuslyricsprovider.cpp @@ -244,7 +244,7 @@ void GeniusLyricsProvider::AccessTokenRequestFinished(QNetworkReply *reply) { QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); if (json_error.error != QJsonParseError::NoError) { - AuthError("Authentication reply from server missing Json data."); + Error(QString("Failed to parse Json data in authentication reply: %1").arg(json_error.errorString())); return; } @@ -333,7 +333,7 @@ void GeniusLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 } if (!json_obj.contains("meta")) { - Error("Json reply is missing meta.", json_obj); + Error("Json reply is missing meta object.", json_obj); EndSearch(search); return; } diff --git a/src/lyrics/jsonlyricsprovider.cpp b/src/lyrics/jsonlyricsprovider.cpp index d5433d3b7..feefdcee4 100644 --- a/src/lyrics/jsonlyricsprovider.cpp +++ b/src/lyrics/jsonlyricsprovider.cpp @@ -54,11 +54,11 @@ QJsonObject JsonLyricsProvider::ExtractJsonObj(const QByteArray &data) { return QJsonObject(); } - QJsonParseError error; - QJsonDocument json_doc = QJsonDocument::fromJson(data, &error); + QJsonParseError json_error; + QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (error.error != QJsonParseError::NoError) { - Error(QString("Failed to parse json data: %1").arg(error.errorString())); + if (json_error.error != QJsonParseError::NoError) { + Error(QString("Failed to parse json data: %1").arg(json_error.errorString())); return QJsonObject(); } diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp index 823345a62..3186cd271 100644 --- a/src/lyrics/lololyricsprovider.cpp +++ b/src/lyrics/lololyricsprovider.cpp @@ -74,9 +74,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i reply->deleteLater(); - QByteArray data; QString failure_reason; - if (reply->error() != QNetworkReply::NoError) { failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); if (reply->error() < 200) { @@ -89,7 +87,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i failure_reason = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()); } - data = reply->readAll(); + QByteArray data = reply->readAll(); LyricsSearchResults results; if (!data.isEmpty()) { diff --git a/src/lyrics/musixmatchlyricsprovider.cpp b/src/lyrics/musixmatchlyricsprovider.cpp index 9b18614b6..b198b36b3 100644 --- a/src/lyrics/musixmatchlyricsprovider.cpp +++ b/src/lyrics/musixmatchlyricsprovider.cpp @@ -85,11 +85,9 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, const qui LyricsSearchResults results; if (reply->error() != QNetworkReply::NoError) { - if (reply->error() < 200) { - Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error())); - emit SearchFinished(id, results); - return; - } + Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error())); + emit SearchFinished(id, results); + return; } else if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { Error(QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()));