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

Replace QLatin1String with operator _L1

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-07 04:24:14 +02:00
parent e3e6a22172
commit 4270b12cd1
185 changed files with 2429 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/covermanager/tidalcoverprovider.cpp
View File

@@ -45,6 +45,8 @@
#include "jsoncoverprovider.h"
#include "tidalcoverprovider.h"
using namespace Qt::StringLiterals;
namespace {
constexpr int kLimit = 10;
}
@@ -73,14 +75,14 @@ bool TidalCoverProvider::StartSearch(const QString &artist, const QString &album
QString resource;
QString query = artist;
if (album.isEmpty() && !title.isEmpty()) {
resource = QLatin1String("search/tracks");
if (!query.isEmpty()) query.append(QLatin1Char(' '));
resource = "search/tracks"_L1;
if (!query.isEmpty()) query.append(u' ');
query.append(title);
}
else {
resource = QLatin1String("search/albums");
resource = "search/albums"_L1;
if (!album.isEmpty()) {
if (!query.isEmpty()) query.append(QLatin1Char(' '));
if (!query.isEmpty()) query.append(u' ');
query.append(album);
}
}
@@ -134,10 +136,10 @@ QByteArray TidalCoverProvider::GetReplyData(QNetworkReply *reply) {
QString error;
if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) {
QJsonObject json_obj = json_doc.object();
if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("status")) && json_obj.contains(QLatin1String("userMessage"))) {
status = json_obj[QLatin1String("status")].toInt();
sub_status = json_obj[QLatin1String("subStatus")].toInt();
QString user_message = json_obj[QLatin1String("userMessage")].toString();
if (!json_obj.isEmpty() && json_obj.contains("status"_L1) && json_obj.contains("userMessage"_L1)) {
status = json_obj["status"_L1].toInt();
sub_status = json_obj["subStatus"_L1].toInt();
QString user_message = json_obj["userMessage"_L1].toString();
error = QStringLiteral("%1 (%2) (%3)").arg(user_message).arg(status).arg(sub_status);
}
}
@@ -180,12 +182,12 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) {
return;
}
if (!json_obj.contains(QLatin1String("items"))) {
if (!json_obj.contains("items"_L1)) {
Error(QStringLiteral("Json object is missing items."), json_obj);
Q_EMIT SearchFinished(id, CoverProviderSearchResults());
return;
}
QJsonValue value_items = json_obj[QLatin1String("items")];
QJsonValue value_items = json_obj["items"_L1];
if (!value_items.isArray()) {
Q_EMIT SearchFinished(id, CoverProviderSearchResults());
@@ -207,25 +209,25 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) {
}
QJsonObject obj_item = value_item.toObject();
if (!obj_item.contains(QLatin1String("artist"))) {
if (!obj_item.contains("artist"_L1)) {
Error(QStringLiteral("Invalid Json reply, items array item is missing artist."), obj_item);
continue;
}
QJsonValue value_artist = obj_item[QLatin1String("artist")];
QJsonValue value_artist = obj_item["artist"_L1];
if (!value_artist.isObject()) {
Error(QStringLiteral("Invalid Json reply, items array item artist is not a object."), value_artist);
continue;
}
QJsonObject obj_artist = value_artist.toObject();
if (!obj_artist.contains(QLatin1String("name"))) {
if (!obj_artist.contains("name"_L1)) {
Error(QStringLiteral("Invalid Json reply, items array item artist is missing name."), obj_artist);
continue;
}
QString artist = obj_artist[QLatin1String("name")].toString();
QString artist = obj_artist["name"_L1].toString();
QJsonObject obj_album;
if (obj_item.contains(QLatin1String("album"))) {
QJsonValue value_album = obj_item[QLatin1String("album")];
if (obj_item.contains("album"_L1)) {
QJsonValue value_album = obj_item["album"_L1];
if (value_album.isObject()) {
obj_album = value_album.toObject();
}
@@ -238,12 +240,12 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) {
obj_album = obj_item;
}
if (!obj_album.contains(QLatin1String("title")) || !obj_album.contains(QLatin1String("cover"))) {
if (!obj_album.contains("title"_L1) || !obj_album.contains("cover"_L1)) {
Error(QStringLiteral("Invalid Json reply, items array item album is missing title or cover."), obj_album);
continue;
}
QString album = obj_album[QLatin1String("title")].toString();
QString cover = obj_album[QLatin1String("cover")].toString().replace(QLatin1String("-"), QLatin1String("/"));
QString album = obj_album["title"_L1].toString();
QString cover = obj_album["cover"_L1].toString().replace("-"_L1, "/"_L1);
CoverProviderSearchResult cover_result;
cover_result.artist = artist;