Replace QStringLiteral with QLatin1String
This commit is contained in:
@@ -40,7 +40,7 @@ AzLyricsComLyricsProvider::AzLyricsComLyricsProvider(SharedPtr<NetworkAccessMana
|
||||
|
||||
QUrl AzLyricsComLyricsProvider::Url(const LyricsSearchRequest &request) {
|
||||
|
||||
return QUrl(QLatin1String(kUrl) + StringFixup(request.artist) + QStringLiteral("/") + StringFixup(request.title) + QStringLiteral(".html"));
|
||||
return QUrl(QLatin1String(kUrl) + StringFixup(request.artist) + QLatin1Char('/') + StringFixup(request.title) + QStringLiteral(".html"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -101,21 +101,21 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id,
|
||||
QXmlStreamReader::TokenType type = reader.readNext();
|
||||
QString name = reader.name().toString();
|
||||
if (type == QXmlStreamReader::StartElement) {
|
||||
if (name == QStringLiteral("GetLyricResult")) {
|
||||
if (name == QLatin1String("GetLyricResult")) {
|
||||
result = LyricsSearchResult();
|
||||
}
|
||||
if (name == QStringLiteral("LyricArtist")) {
|
||||
if (name == QLatin1String("LyricArtist")) {
|
||||
result.artist = reader.readElementText();
|
||||
}
|
||||
else if (name == QStringLiteral("LyricSong")) {
|
||||
else if (name == QLatin1String("LyricSong")) {
|
||||
result.title = reader.readElementText();
|
||||
}
|
||||
else if (name == QStringLiteral("Lyric")) {
|
||||
else if (name == QLatin1String("Lyric")) {
|
||||
result.lyrics = reader.readElementText();
|
||||
}
|
||||
}
|
||||
else if (type == QXmlStreamReader::EndElement) {
|
||||
if (name == QStringLiteral("GetLyricResult")) {
|
||||
if (name == QLatin1String("GetLyricResult")) {
|
||||
if (!result.artist.isEmpty() && !result.title.isEmpty() && !result.lyrics.isEmpty() &&
|
||||
(result.artist.compare(request.albumartist, Qt::CaseInsensitive) == 0 ||
|
||||
result.artist.compare(request.artist, Qt::CaseInsensitive) == 0 ||
|
||||
|
||||
@@ -40,7 +40,7 @@ ElyricsNetLyricsProvider::ElyricsNetLyricsProvider(SharedPtr<NetworkAccessManage
|
||||
|
||||
QUrl ElyricsNetLyricsProvider::Url(const LyricsSearchRequest &request) {
|
||||
|
||||
return QUrl(QLatin1String(kUrl) + request.artist[0].toLower() + QLatin1Char('/') + StringFixup(request.artist) + QStringLiteral("-lyrics/") + StringFixup(request.title) + QStringLiteral("-lyrics.html"));
|
||||
return QUrl(QLatin1String(kUrl) + request.artist[0].toLower() + QLatin1Char('/') + StringFixup(request.artist) + QLatin1String("-lyrics/") + StringFixup(request.title) + QLatin1String("-lyrics.html"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -226,9 +226,9 @@ void GeniusLyricsProvider::AccessTokenRequestFinished(QNetworkReply *reply) {
|
||||
QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
|
||||
if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) {
|
||||
QJsonObject json_obj = json_doc.object();
|
||||
if (!json_obj.isEmpty() && json_obj.contains(QStringLiteral("error")) && json_obj.contains(QStringLiteral("error_description"))) {
|
||||
QString error = json_obj[QStringLiteral("error")].toString();
|
||||
QString error_description = json_obj[QStringLiteral("error_description")].toString();
|
||||
if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("error_description"))) {
|
||||
QString error = json_obj[QLatin1String("error")].toString();
|
||||
QString error_description = json_obj[QLatin1String("error_description")].toString();
|
||||
login_errors_ << QStringLiteral("Authentication failure: %1 (%2)").arg(error, error_description);
|
||||
}
|
||||
}
|
||||
@@ -271,12 +271,12 @@ void GeniusLyricsProvider::AccessTokenRequestFinished(QNetworkReply *reply) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!json_obj.contains(QStringLiteral("access_token"))) {
|
||||
if (!json_obj.contains(QLatin1String("access_token"))) {
|
||||
AuthError(QStringLiteral("Authentication reply from server is missing access token."), json_obj);
|
||||
return;
|
||||
}
|
||||
|
||||
access_token_ = json_obj[QStringLiteral("access_token")].toString();
|
||||
access_token_ = json_obj[QLatin1String("access_token")].toString();
|
||||
|
||||
Settings s;
|
||||
s.beginGroup(kSettingsGroup);
|
||||
@@ -333,26 +333,26 @@ void GeniusLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id)
|
||||
return;
|
||||
}
|
||||
|
||||
if (!json_obj.contains(QStringLiteral("meta"))) {
|
||||
if (!json_obj.contains(QLatin1String("meta"))) {
|
||||
Error(QStringLiteral("Json reply is missing meta object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!json_obj[QStringLiteral("meta")].isObject()) {
|
||||
if (!json_obj[QLatin1String("meta")].isObject()) {
|
||||
Error(QStringLiteral("Json reply meta is not an object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_meta = json_obj[QStringLiteral("meta")].toObject();
|
||||
if (!obj_meta.contains(QStringLiteral("status"))) {
|
||||
QJsonObject obj_meta = json_obj[QLatin1String("meta")].toObject();
|
||||
if (!obj_meta.contains(QLatin1String("status"))) {
|
||||
Error(QStringLiteral("Json reply meta object is missing status."), obj_meta);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
int status = obj_meta[QStringLiteral("status")].toInt();
|
||||
int status = obj_meta[QLatin1String("status")].toInt();
|
||||
if (status != 200) {
|
||||
if (obj_meta.contains(QStringLiteral("message"))) {
|
||||
Error(QStringLiteral("Received error %1: %2.").arg(status).arg(obj_meta[QStringLiteral("message")].toString()));
|
||||
if (obj_meta.contains(QLatin1String("message"))) {
|
||||
Error(QStringLiteral("Received error %1: %2.").arg(status).arg(obj_meta[QLatin1String("message")].toString()));
|
||||
}
|
||||
else {
|
||||
Error(QStringLiteral("Received error %1.").arg(status));
|
||||
@@ -361,50 +361,50 @@ void GeniusLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id)
|
||||
return;
|
||||
}
|
||||
|
||||
if (!json_obj.contains(QStringLiteral("response"))) {
|
||||
if (!json_obj.contains(QLatin1String("response"))) {
|
||||
Error(QStringLiteral("Json reply is missing response."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!json_obj[QStringLiteral("response")].isObject()) {
|
||||
if (!json_obj[QLatin1String("response")].isObject()) {
|
||||
Error(QStringLiteral("Json response is not an object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_response = json_obj[QStringLiteral("response")].toObject();
|
||||
if (!obj_response.contains(QStringLiteral("hits"))) {
|
||||
QJsonObject obj_response = json_obj[QLatin1String("response")].toObject();
|
||||
if (!obj_response.contains(QLatin1String("hits"))) {
|
||||
Error(QStringLiteral("Json response is missing hits."), obj_response);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!obj_response[QStringLiteral("hits")].isArray()) {
|
||||
if (!obj_response[QLatin1String("hits")].isArray()) {
|
||||
Error(QStringLiteral("Json hits is not an array."), obj_response);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonArray array_hits = obj_response[QStringLiteral("hits")].toArray();
|
||||
QJsonArray array_hits = obj_response[QLatin1String("hits")].toArray();
|
||||
|
||||
for (const QJsonValueRef value_hit : array_hits) {
|
||||
if (!value_hit.isObject()) {
|
||||
continue;
|
||||
}
|
||||
QJsonObject obj_hit = value_hit.toObject();
|
||||
if (!obj_hit.contains(QStringLiteral("result"))) {
|
||||
if (!obj_hit.contains(QLatin1String("result"))) {
|
||||
continue;
|
||||
}
|
||||
if (!obj_hit[QStringLiteral("result")].isObject()) {
|
||||
if (!obj_hit[QLatin1String("result")].isObject()) {
|
||||
continue;
|
||||
}
|
||||
QJsonObject obj_result = obj_hit[QStringLiteral("result")].toObject();
|
||||
if (!obj_result.contains(QStringLiteral("title")) || !obj_result.contains(QStringLiteral("primary_artist")) || !obj_result.contains(QStringLiteral("url")) || !obj_result[QStringLiteral("primary_artist")].isObject()) {
|
||||
QJsonObject obj_result = obj_hit[QLatin1String("result")].toObject();
|
||||
if (!obj_result.contains(QLatin1String("title")) || !obj_result.contains(QLatin1String("primary_artist")) || !obj_result.contains(QLatin1String("url")) || !obj_result[QLatin1String("primary_artist")].isObject()) {
|
||||
Error(QStringLiteral("Missing one or more values in result object"), obj_result);
|
||||
continue;
|
||||
}
|
||||
QJsonObject primary_artist = obj_result[QStringLiteral("primary_artist")].toObject();
|
||||
if (!primary_artist.contains(QStringLiteral("name"))) continue;
|
||||
QJsonObject primary_artist = obj_result[QLatin1String("primary_artist")].toObject();
|
||||
if (!primary_artist.contains(QLatin1String("name"))) continue;
|
||||
|
||||
QString artist = primary_artist[QStringLiteral("name")].toString();
|
||||
QString title = obj_result[QStringLiteral("title")].toString();
|
||||
QString artist = primary_artist[QLatin1String("name")].toString();
|
||||
QString title = obj_result[QLatin1String("title")].toString();
|
||||
|
||||
// Ignore results where both the artist and title don't match.
|
||||
if (!artist.startsWith(search->request.albumartist, Qt::CaseInsensitive) &&
|
||||
@@ -413,7 +413,7 @@ void GeniusLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id)
|
||||
continue;
|
||||
}
|
||||
|
||||
QUrl url(obj_result[QStringLiteral("url")].toString());
|
||||
QUrl url(obj_result[QLatin1String("url")].toString());
|
||||
if (!url.isValid()) continue;
|
||||
if (search->requests_lyric_.contains(url)) continue;
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ LetrasLyricsProvider::LetrasLyricsProvider(SharedPtr<NetworkAccessManager> netwo
|
||||
|
||||
QUrl LetrasLyricsProvider::Url(const LyricsSearchRequest &request) {
|
||||
|
||||
return QUrl(QLatin1String(kUrl) + QStringLiteral("?musica=") + StringFixup(request.artist) + QStringLiteral("&artista=") + StringFixup(request.title));
|
||||
return QUrl(QLatin1String(kUrl) + QLatin1String("?musica=") + StringFixup(request.artist) + QLatin1String("&artista=") + StringFixup(request.title));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -105,15 +105,15 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, c
|
||||
QXmlStreamReader::TokenType type = reader.readNext();
|
||||
QString name = reader.name().toString();
|
||||
if (type == QXmlStreamReader::StartElement) {
|
||||
if (name == QStringLiteral("result")) {
|
||||
if (name == QLatin1String("result")) {
|
||||
status.clear();
|
||||
result = LyricsSearchResult();
|
||||
}
|
||||
else if (name == QStringLiteral("status")) {
|
||||
else if (name == QLatin1String("status")) {
|
||||
status = reader.readElementText();
|
||||
}
|
||||
else if (name == QStringLiteral("response")) {
|
||||
if (status == QStringLiteral("OK")) {
|
||||
else if (name == QLatin1String("response")) {
|
||||
if (status == QLatin1String("OK")) {
|
||||
result.lyrics = reader.readElementText();
|
||||
}
|
||||
else {
|
||||
@@ -123,7 +123,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, c
|
||||
}
|
||||
}
|
||||
else if (type == QXmlStreamReader::EndElement) {
|
||||
if (name == QStringLiteral("result")) {
|
||||
if (name == QLatin1String("result")) {
|
||||
if (!result.lyrics.isEmpty()) {
|
||||
result.lyrics = Utilities::DecodeHtmlEntities(result.lyrics);
|
||||
results << result;
|
||||
|
||||
@@ -136,31 +136,31 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, LyricsSea
|
||||
return;
|
||||
}
|
||||
|
||||
if (!json_obj.contains(QStringLiteral("message"))) {
|
||||
if (!json_obj.contains(QLatin1String("message"))) {
|
||||
Error(QStringLiteral("Json reply is missing message object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!json_obj[QStringLiteral("message")].isObject()) {
|
||||
if (!json_obj[QLatin1String("message")].isObject()) {
|
||||
Error(QStringLiteral("Json reply message is not an object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_message = json_obj[QStringLiteral("message")].toObject();
|
||||
QJsonObject obj_message = json_obj[QLatin1String("message")].toObject();
|
||||
|
||||
if (!obj_message.contains(QStringLiteral("header"))) {
|
||||
if (!obj_message.contains(QLatin1String("header"))) {
|
||||
Error(QStringLiteral("Json reply message object is missing header."), obj_message);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!obj_message[QStringLiteral("header")].isObject()) {
|
||||
if (!obj_message[QLatin1String("header")].isObject()) {
|
||||
Error(QStringLiteral("Json reply message header is not an object."), obj_message);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_header = obj_message[QStringLiteral("header")].toObject();
|
||||
QJsonObject obj_header = obj_message[QLatin1String("header")].toObject();
|
||||
|
||||
int status_code = obj_header[QStringLiteral("status_code")].toInt();
|
||||
int status_code = obj_header[QLatin1String("status_code")].toInt();
|
||||
if (status_code != 200) {
|
||||
Error(QStringLiteral("Received status code %1, switching to URL based lookup.").arg(status_code));
|
||||
use_api_ = false;
|
||||
@@ -168,29 +168,29 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, LyricsSea
|
||||
return;
|
||||
}
|
||||
|
||||
if (!obj_message.contains(QStringLiteral("body"))) {
|
||||
if (!obj_message.contains(QLatin1String("body"))) {
|
||||
Error(QStringLiteral("Json reply is missing body."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!obj_message[QStringLiteral("body")].isObject()) {
|
||||
if (!obj_message[QLatin1String("body")].isObject()) {
|
||||
Error(QStringLiteral("Json body is not an object."), json_obj);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_body = obj_message[QStringLiteral("body")].toObject();
|
||||
QJsonObject obj_body = obj_message[QLatin1String("body")].toObject();
|
||||
|
||||
if (!obj_body.contains(QStringLiteral("track_list"))) {
|
||||
if (!obj_body.contains(QLatin1String("track_list"))) {
|
||||
Error(QStringLiteral("Json response is missing body."), obj_body);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
if (!obj_body[QStringLiteral("track_list")].isArray()) {
|
||||
if (!obj_body[QLatin1String("track_list")].isArray()) {
|
||||
Error(QStringLiteral("Json hits is not an array."), obj_body);
|
||||
EndSearch(search);
|
||||
return;
|
||||
}
|
||||
QJsonArray array_tracklist = obj_body[QStringLiteral("track_list")].toArray();
|
||||
QJsonArray array_tracklist = obj_body[QLatin1String("track_list")].toArray();
|
||||
|
||||
for (const QJsonValueRef value_track : array_tracklist) {
|
||||
if (!value_track.isObject()) {
|
||||
@@ -198,23 +198,23 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, LyricsSea
|
||||
}
|
||||
QJsonObject obj_track = value_track.toObject();
|
||||
|
||||
if (!obj_track.contains(QStringLiteral("track")) || !obj_track[QStringLiteral("track")].isObject()) {
|
||||
if (!obj_track.contains(QLatin1String("track")) || !obj_track[QLatin1String("track")].isObject()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
obj_track = obj_track[QStringLiteral("track")].toObject();
|
||||
if (!obj_track.contains(QStringLiteral("artist_name")) ||
|
||||
!obj_track.contains(QStringLiteral("album_name")) ||
|
||||
!obj_track.contains(QStringLiteral("track_name")) ||
|
||||
!obj_track.contains(QStringLiteral("track_share_url"))) {
|
||||
obj_track = obj_track[QLatin1String("track")].toObject();
|
||||
if (!obj_track.contains(QLatin1String("artist_name")) ||
|
||||
!obj_track.contains(QLatin1String("album_name")) ||
|
||||
!obj_track.contains(QLatin1String("track_name")) ||
|
||||
!obj_track.contains(QLatin1String("track_share_url"))) {
|
||||
Error(QStringLiteral("Missing one or more values in result object"), obj_track);
|
||||
continue;
|
||||
}
|
||||
|
||||
QString artist_name = obj_track[QStringLiteral("artist_name")].toString();
|
||||
QString album_name = obj_track[QStringLiteral("album_name")].toString();
|
||||
QString track_name = obj_track[QStringLiteral("track_name")].toString();
|
||||
QUrl track_share_url(obj_track[QStringLiteral("track_share_url")].toString());
|
||||
QString artist_name = obj_track[QLatin1String("artist_name")].toString();
|
||||
QString album_name = obj_track[QLatin1String("album_name")].toString();
|
||||
QString track_name = obj_track[QLatin1String("track_name")].toString();
|
||||
QUrl track_share_url(obj_track[QLatin1String("track_share_url")].toString());
|
||||
|
||||
// Ignore results where both the artist, album and title don't match.
|
||||
if (use_api_ &&
|
||||
@@ -298,8 +298,8 @@ void MusixmatchLyricsProvider::HandleLyricsReply(QNetworkReply *reply, LyricsSea
|
||||
}
|
||||
|
||||
const QString content = QString::fromUtf8(data);
|
||||
const QString data_begin = QStringLiteral("<script id=\"__NEXT_DATA__\" type=\"application/json\">");
|
||||
const QString data_end = QStringLiteral("</script>");
|
||||
const QString data_begin = QLatin1String("<script id=\"__NEXT_DATA__\" type=\"application/json\">");
|
||||
const QString data_end = QLatin1String("</script>");
|
||||
qint64 begin_idx = content.indexOf(data_begin);
|
||||
QString content_json;
|
||||
if (begin_idx > 0) {
|
||||
@@ -326,86 +326,86 @@ void MusixmatchLyricsProvider::HandleLyricsReply(QNetworkReply *reply, LyricsSea
|
||||
return;
|
||||
}
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("props")) || !obj_data[QStringLiteral("props")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("props")) || !obj_data[QLatin1String("props")].isObject()) {
|
||||
Error(QStringLiteral("Json reply is missing props."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
obj_data = obj_data[QStringLiteral("props")].toObject();
|
||||
obj_data = obj_data[QLatin1String("props")].toObject();
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("pageProps")) || !obj_data[QStringLiteral("pageProps")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("pageProps")) || !obj_data[QLatin1String("pageProps")].isObject()) {
|
||||
Error(QStringLiteral("Json props is missing pageProps."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
obj_data = obj_data[QStringLiteral("pageProps")].toObject();
|
||||
obj_data = obj_data[QLatin1String("pageProps")].toObject();
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("data")) || !obj_data[QStringLiteral("data")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("data")) || !obj_data[QLatin1String("data")].isObject()) {
|
||||
Error(QStringLiteral("Json pageProps is missing data."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
obj_data = obj_data[QStringLiteral("data")].toObject();
|
||||
obj_data = obj_data[QLatin1String("data")].toObject();
|
||||
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("trackInfo")) || !obj_data[QStringLiteral("trackInfo")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("trackInfo")) || !obj_data[QLatin1String("trackInfo")].isObject()) {
|
||||
Error(QStringLiteral("Json data is missing trackInfo."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
obj_data = obj_data[QStringLiteral("trackInfo")].toObject();
|
||||
obj_data = obj_data[QLatin1String("trackInfo")].toObject();
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("data")) || !obj_data[QStringLiteral("data")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("data")) || !obj_data[QLatin1String("data")].isObject()) {
|
||||
Error(QStringLiteral("Json trackInfo reply is missing data."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
obj_data = obj_data[QStringLiteral("data")].toObject();
|
||||
obj_data = obj_data[QLatin1String("data")].toObject();
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("track")) || !obj_data[QStringLiteral("track")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("track")) || !obj_data[QLatin1String("track")].isObject()) {
|
||||
Error(QStringLiteral("Json data is missing track."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
|
||||
const QJsonObject obj_track = obj_data[QStringLiteral("track")].toObject();
|
||||
const QJsonObject obj_track = obj_data[QLatin1String("track")].toObject();
|
||||
|
||||
if (!obj_track.contains(QStringLiteral("hasLyrics")) || !obj_track[QStringLiteral("hasLyrics")].isBool()) {
|
||||
if (!obj_track.contains(QLatin1String("hasLyrics")) || !obj_track[QLatin1String("hasLyrics")].isBool()) {
|
||||
Error(QStringLiteral("Json track is missing hasLyrics."), obj_track);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
|
||||
const bool has_lyrics = obj_track[QStringLiteral("hasLyrics")].toBool();
|
||||
const bool has_lyrics = obj_track[QLatin1String("hasLyrics")].toBool();
|
||||
if (!has_lyrics) {
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
|
||||
LyricsSearchResult result;
|
||||
if (obj_track.contains(QStringLiteral("artistName")) && obj_track[QStringLiteral("artistName")].isString()) {
|
||||
result.artist = obj_track[QStringLiteral("artistName")].toString();
|
||||
if (obj_track.contains(QLatin1String("artistName")) && obj_track[QLatin1String("artistName")].isString()) {
|
||||
result.artist = obj_track[QLatin1String("artistName")].toString();
|
||||
}
|
||||
if (obj_track.contains(QStringLiteral("albumName")) && obj_track[QStringLiteral("albumName")].isString()) {
|
||||
result.album = obj_track[QStringLiteral("albumName")].toString();
|
||||
if (obj_track.contains(QLatin1String("albumName")) && obj_track[QLatin1String("albumName")].isString()) {
|
||||
result.album = obj_track[QLatin1String("albumName")].toString();
|
||||
}
|
||||
if (obj_track.contains(QStringLiteral("name")) && obj_track[QStringLiteral("name")].isString()) {
|
||||
result.title = obj_track[QStringLiteral("name")].toString();
|
||||
if (obj_track.contains(QLatin1String("name")) && obj_track[QLatin1String("name")].isString()) {
|
||||
result.title = obj_track[QLatin1String("name")].toString();
|
||||
}
|
||||
|
||||
if (!obj_data.contains(QStringLiteral("lyrics")) || !obj_data[QStringLiteral("lyrics")].isObject()) {
|
||||
if (!obj_data.contains(QLatin1String("lyrics")) || !obj_data[QLatin1String("lyrics")].isObject()) {
|
||||
Error(QStringLiteral("Json data is missing lyrics."), obj_data);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
QJsonObject obj_lyrics = obj_data[QStringLiteral("lyrics")].toObject();
|
||||
QJsonObject obj_lyrics = obj_data[QLatin1String("lyrics")].toObject();
|
||||
|
||||
if (!obj_lyrics.contains(QStringLiteral("body")) || !obj_lyrics[QStringLiteral("body")].isString()) {
|
||||
if (!obj_lyrics.contains(QLatin1String("body")) || !obj_lyrics[QLatin1String("body")].isString()) {
|
||||
Error(QStringLiteral("Json lyrics reply is missing body."), obj_lyrics);
|
||||
EndSearch(search, url);
|
||||
return;
|
||||
}
|
||||
result.lyrics = obj_lyrics[QStringLiteral("body")].toString();
|
||||
result.lyrics = obj_lyrics[QLatin1String("body")].toString();
|
||||
|
||||
if (!result.lyrics.isEmpty()) {
|
||||
result.lyrics = Utilities::DecodeHtmlEntities(result.lyrics);
|
||||
|
||||
@@ -81,20 +81,20 @@ void OVHLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, co
|
||||
return;
|
||||
}
|
||||
|
||||
if (json_obj.contains(QStringLiteral("error"))) {
|
||||
Error(json_obj[QStringLiteral("error")].toString());
|
||||
if (json_obj.contains(QLatin1String("error"))) {
|
||||
Error(json_obj[QLatin1String("error")].toString());
|
||||
qLog(Debug) << "OVHLyrics: No lyrics for" << request.artist << request.title;
|
||||
emit SearchFinished(id);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!json_obj.contains(QStringLiteral("lyrics"))) {
|
||||
if (!json_obj.contains(QLatin1String("lyrics"))) {
|
||||
emit SearchFinished(id);
|
||||
return;
|
||||
}
|
||||
|
||||
LyricsSearchResult result;
|
||||
result.lyrics = json_obj[QStringLiteral("lyrics")].toString();
|
||||
result.lyrics = json_obj[QLatin1String("lyrics")].toString();
|
||||
|
||||
if (result.lyrics.isEmpty()) {
|
||||
qLog(Debug) << "OVHLyrics: No lyrics for" << request.artist << request.title;
|
||||
|
||||
@@ -39,7 +39,7 @@ SongLyricsComLyricsProvider::SongLyricsComLyricsProvider(SharedPtr<NetworkAccess
|
||||
|
||||
QUrl SongLyricsComLyricsProvider::Url(const LyricsSearchRequest &request) {
|
||||
|
||||
return QUrl(QLatin1String(kUrl) + StringFixup(request.artist) + QLatin1Char('/') + StringFixup(request.title) + QStringLiteral("-lyrics/"));
|
||||
return QUrl(QLatin1String(kUrl) + StringFixup(request.artist) + QLatin1Char('/') + StringFixup(request.title) + QLatin1String("-lyrics/"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user