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

120
src/scrobbler/scrobblingapi20.cpp
View File

@@ -61,6 +61,8 @@
#include "scrobblercacheitem.h"
#include "scrobblemetadata.h"
using namespace Qt::StringLiterals;
const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e";
namespace {
@@ -171,9 +173,9 @@ ScrobblingAPI20::ReplyResult ScrobblingAPI20::GetJsonObject(QNetworkReply *reply
if (reply->error() == QNetworkReply::NoError || reply->error() >= 200) {
const QByteArray data = reply->readAll();
int error_code = 0;
if (!data.isEmpty() && ExtractJsonObj(data, json_obj, error_description) && json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("message"))) {
error_code = json_obj[QLatin1String("error")].toInt();
QString error_message = json_obj[QLatin1String("message")].toString();
if (!data.isEmpty() && ExtractJsonObj(data, json_obj, error_description) && json_obj.contains("error"_L1) && json_obj.contains("message"_L1)) {
error_code = json_obj["error"_L1].toInt();
QString error_message = json_obj["message"_L1].toString();
error_description = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
reply_error_type = ReplyResult::APIError;
}
@@ -286,7 +288,7 @@ void ScrobblingAPI20::RequestSession(const QString &token) {
}
data_to_sign += QLatin1String(kSecret);
QByteArray const digest = QCryptographicHash::hash(data_to_sign.toUtf8(), QCryptographicHash::Md5);
const QString signature = QString::fromLatin1(digest.toHex()).rightJustified(32, QLatin1Char('0')).toLower();
const QString signature = QString::fromLatin1(digest.toHex()).rightJustified(32, u'0').toLower();
session_url_query.addQueryItem(QStringLiteral("api_sig"), signature);
session_url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(QStringLiteral("format"))), QString::fromLatin1(QUrl::toPercentEncoding(QStringLiteral("json"))));
session_url.setQuery(session_url_query);
@@ -313,12 +315,12 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QLatin1String("session"))) {
if (!json_obj.contains("session"_L1)) {
AuthError(QStringLiteral("Json reply from server is missing session."));
return;
}
QJsonValue json_session = json_obj[QLatin1String("session")];
QJsonValue json_session = json_obj["session"_L1];
if (!json_session.isObject()) {
AuthError(QStringLiteral("Json session is not an object."));
return;
@@ -328,14 +330,14 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) {
AuthError(QStringLiteral("Json session object is empty."));
return;
}
if (!json_obj.contains(QLatin1String("subscriber")) || !json_obj.contains(QLatin1String("name")) || !json_obj.contains(QLatin1String("key"))) {
if (!json_obj.contains("subscriber"_L1) || !json_obj.contains("name"_L1) || !json_obj.contains("key"_L1)) {
AuthError(QStringLiteral("Json session object is missing values."));
return;
}
subscriber_ = json_obj[QLatin1String("subscriber")].toBool();
username_ = json_obj[QLatin1String("name")].toString();
session_key_ = json_obj[QLatin1String("key")].toString();
subscriber_ = json_obj["subscriber"_L1].toBool();
username_ = json_obj["name"_L1].toString();
session_key_ = json_obj["key"_L1].toString();
Settings s;
s.beginGroup(settings_group_);
@@ -370,7 +372,7 @@ QNetworkReply *ScrobblingAPI20::CreateRequest(const ParamList &request_params) {
data_to_sign += QLatin1String(kSecret);
QByteArray const digest = QCryptographicHash::hash(data_to_sign.toUtf8(), QCryptographicHash::Md5);
const QString signature = QString::fromLatin1(digest.toHex()).rightJustified(32, QLatin1Char('0')).toLower();
const QString signature = QString::fromLatin1(digest.toHex()).rightJustified(32, u'0').toLower();
url_query.addQueryItem(QStringLiteral("api_sig"), QString::fromLatin1(QUrl::toPercentEncoding(signature)));
url_query.addQueryItem(QStringLiteral("format"), QStringLiteral("json"));
@@ -431,7 +433,7 @@ void ScrobblingAPI20::UpdateNowPlayingRequestFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QLatin1String("nowplaying"))) {
if (!json_obj.contains("nowplaying"_L1)) {
Error(QStringLiteral("Json reply from server is missing nowplaying."), json_obj);
return;
}
@@ -510,13 +512,13 @@ void ScrobblingAPI20::Submit() {
params << Param(QStringLiteral("%1[%2]").arg(QStringLiteral("timestamp")).arg(i), QString::number(cache_item->timestamp));
params << Param(QStringLiteral("%1[%2]").arg(QStringLiteral("duration")).arg(i), QString::number(cache_item->metadata.length_nanosec / kNsecPerSec));
if (!cache_item->metadata.album.isEmpty()) {
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("album")).arg(i), StripAlbum(cache_item->metadata.album));
params << Param(QStringLiteral("%1[%2]").arg("album"_L1).arg(i), StripAlbum(cache_item->metadata.album));
}
if (!prefer_albumartist_ && !cache_item->metadata.albumartist.isEmpty()) {
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("albumArtist")).arg(i), cache_item->metadata.albumartist);
params << Param(QStringLiteral("%1[%2]").arg("albumArtist"_L1).arg(i), cache_item->metadata.albumartist);
}
if (cache_item->metadata.track > 0) {
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("trackNumber")).arg(i), QString::number(cache_item->metadata.track));
params << Param(QStringLiteral("%1[%2]").arg("trackNumber"_L1).arg(i), QString::number(cache_item->metadata.track));
}
++i;
if (cache_items_sent.count() >= kScrobblesPerRequest) break;
@@ -553,13 +555,13 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
cache_->Flush(cache_items);
submit_error_ = false;
if (!json_obj.contains(QLatin1String("scrobbles"))) {
if (!json_obj.contains("scrobbles"_L1)) {
Error(QStringLiteral("Json reply from server is missing scrobbles."), json_obj);
StartSubmit();
return;
}
QJsonValue value_scrobbles = json_obj[QLatin1String("scrobbles")];
QJsonValue value_scrobbles = json_obj["scrobbles"_L1];
if (!value_scrobbles.isObject()) {
Error(QStringLiteral("Json scrobbles is not an object."), json_obj);
StartSubmit();
@@ -571,13 +573,13 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
StartSubmit();
return;
}
if (!json_obj.contains(QLatin1String("@attr")) || !json_obj.contains(QLatin1String("scrobble"))) {
if (!json_obj.contains("@attr"_L1) || !json_obj.contains("scrobble"_L1)) {
Error(QStringLiteral("Json scrobbles object is missing values."), json_obj);
StartSubmit();
return;
}
QJsonValue value_attr = json_obj[QLatin1String("@attr")];
QJsonValue value_attr = json_obj["@attr"_L1];
if (!value_attr.isObject()) {
Error(QStringLiteral("Json scrobbles attr is not an object."), value_attr);
StartSubmit();
@@ -589,19 +591,19 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
StartSubmit();
return;
}
if (!obj_attr.contains(QLatin1String("accepted")) || !obj_attr.contains(QLatin1String("ignored"))) {
if (!obj_attr.contains("accepted"_L1) || !obj_attr.contains("ignored"_L1)) {
Error(QStringLiteral("Json scrobbles attr is missing values."), obj_attr);
StartSubmit();
return;
}
int accepted = obj_attr[QLatin1String("accepted")].toInt();
int ignored = obj_attr[QLatin1String("ignored")].toInt();
int accepted = obj_attr["accepted"_L1].toInt();
int ignored = obj_attr["ignored"_L1].toInt();
qLog(Debug) << name_ << "Scrobbles accepted:" << accepted << "ignored:" << ignored;
QJsonArray array_scrobble;
QJsonValue value_scrobble = json_obj[QLatin1String("scrobble")];
QJsonValue value_scrobble = json_obj["scrobble"_L1];
if (value_scrobble.isObject()) {
QJsonObject obj_scrobble = value_scrobble.toObject();
if (obj_scrobble.isEmpty()) {
@@ -636,21 +638,21 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
continue;
}
if (!json_track.contains(QLatin1String("artist")) ||
!json_track.contains(QLatin1String("album")) ||
!json_track.contains(QLatin1String("albumArtist")) ||
!json_track.contains(QLatin1String("track")) ||
!json_track.contains(QLatin1String("timestamp")) ||
!json_track.contains(QLatin1String("ignoredMessage"))
if (!json_track.contains("artist"_L1) ||
!json_track.contains("album"_L1) ||
!json_track.contains("albumArtist"_L1) ||
!json_track.contains("track"_L1) ||
!json_track.contains("timestamp"_L1) ||
!json_track.contains("ignoredMessage"_L1)
) {
Error(QStringLiteral("Json scrobbles scrobble is missing values."), json_track);
continue;
}
QJsonValue value_artist = json_track[QLatin1String("artist")];
QJsonValue value_album = json_track[QLatin1String("album")];
QJsonValue value_song = json_track[QLatin1String("track")];
QJsonValue value_ignoredmessage = json_track[QLatin1String("ignoredMessage")];
QJsonValue value_artist = json_track["artist"_L1];
QJsonValue value_album = json_track["album"_L1];
QJsonValue value_song = json_track["track"_L1];
QJsonValue value_ignoredmessage = json_track["ignoredMessage"_L1];
//quint64 timestamp = json_track[QLatin1String("timestamp")].toVariant().toULongLong();
if (!value_artist.isObject() || !value_album.isObject() || !value_song.isObject() || !value_ignoredmessage.isObject()) {
@@ -668,15 +670,15 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
continue;
}
if (!obj_artist.contains(QLatin1String("#text")) || !obj_album.contains(QLatin1String("#text")) || !obj_song.contains(QLatin1String("#text"))) {
if (!obj_artist.contains("#text"_L1) || !obj_album.contains("#text"_L1) || !obj_song.contains("#text"_L1)) {
continue;
}
//QString artist = obj_artist["#text"].toString();
//QString album = obj_album["#text"].toString();
QString song = obj_song[QLatin1String("#text")].toString();
bool ignoredmessage = obj_ignoredmessage[QLatin1String("code")].toVariant().toBool();
QString ignoredmessage_text = obj_ignoredmessage[QLatin1String("#text")].toString();
QString song = obj_song["#text"_L1].toString();
bool ignoredmessage = obj_ignoredmessage["code"_L1].toVariant().toBool();
QString ignoredmessage_text = obj_ignoredmessage["#text"_L1].toString();
if (ignoredmessage) {
Error(QStringLiteral("Scrobble for \"%1\" ignored: %2").arg(song, ignoredmessage_text));
@@ -730,7 +732,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!json_obj.contains(QLatin1String("scrobbles"))) {
if (!json_obj.contains("scrobbles"_L1)) {
Error(QStringLiteral("Json reply from server is missing scrobbles."), json_obj);
cache_item->sent = false;
return;
@@ -738,7 +740,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
cache_->Remove(cache_item);
QJsonValue value_scrobbles = json_obj[QLatin1String("scrobbles")];
QJsonValue value_scrobbles = json_obj["scrobbles"_L1];
if (!value_scrobbles.isObject()) {
Error(QStringLiteral("Json scrobbles is not an object."), json_obj);
return;
@@ -748,12 +750,12 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
Error(QStringLiteral("Json scrobbles object is empty."), value_scrobbles);
return;
}
if (!json_obj.contains(QLatin1String("@attr")) || !json_obj.contains(QLatin1String("scrobble"))) {
if (!json_obj.contains("@attr"_L1) || !json_obj.contains("scrobble"_L1)) {
Error(QStringLiteral("Json scrobbles object is missing values."), json_obj);
return;
}
QJsonValue value_attr = json_obj[QLatin1String("@attr")];
QJsonValue value_attr = json_obj["@attr"_L1];
if (!value_attr.isObject()) {
Error(QStringLiteral("Json scrobbles attr is not an object."), value_attr);
return;
@@ -764,7 +766,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
QJsonValue value_scrobble = json_obj[QLatin1String("scrobble")];
QJsonValue value_scrobble = json_obj["scrobble"_L1];
if (!value_scrobble.isObject()) {
Error(QStringLiteral("Json scrobbles scrobble is not an object."), value_scrobble);
return;
@@ -775,19 +777,19 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!obj_attr.contains(QLatin1String("accepted")) || !obj_attr.contains(QLatin1String("ignored"))) {
if (!obj_attr.contains("accepted"_L1) || !obj_attr.contains("ignored"_L1)) {
Error(QStringLiteral("Json scrobbles attr is missing values."), obj_attr);
return;
}
if (!json_obj_scrobble.contains(QLatin1String("artist")) || !json_obj_scrobble.contains(QLatin1String("album")) || !json_obj_scrobble.contains(QLatin1String("albumArtist")) || !json_obj_scrobble.contains(QLatin1String("track")) || !json_obj_scrobble.contains(QLatin1String("timestamp"))) {
if (!json_obj_scrobble.contains("artist"_L1) || !json_obj_scrobble.contains("album"_L1) || !json_obj_scrobble.contains("albumArtist"_L1) || !json_obj_scrobble.contains("track"_L1) || !json_obj_scrobble.contains("timestamp"_L1)) {
Error(QStringLiteral("Json scrobbles scrobble is missing values."), json_obj_scrobble);
return;
}
QJsonValue json_value_artist = json_obj_scrobble[QLatin1String("artist")];
QJsonValue json_value_album = json_obj_scrobble[QLatin1String("album")];
QJsonValue json_value_song = json_obj_scrobble[QLatin1String("track")];
QJsonValue json_value_artist = json_obj_scrobble["artist"_L1];
QJsonValue json_value_album = json_obj_scrobble["album"_L1];
QJsonValue json_value_song = json_obj_scrobble["track"_L1];
if (!json_value_artist.isObject() || !json_value_album.isObject() || !json_value_song.isObject()) {
Error(QStringLiteral("Json scrobbles scrobble values are not objects."), json_obj_scrobble);
@@ -803,16 +805,16 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!json_obj_artist.contains(QLatin1String("#text")) || !json_obj_album.contains(QLatin1String("#text")) || !json_obj_song.contains(QLatin1String("#text"))) {
if (!json_obj_artist.contains("#text"_L1) || !json_obj_album.contains("#text"_L1) || !json_obj_song.contains("#text"_L1)) {
Error(QStringLiteral("Json scrobbles scrobble values objects are missing #text."), json_obj_artist);
return;
}
//QString artist = json_obj_artist["#text"].toString();
//QString album = json_obj_album["#text"].toString();
QString song = json_obj_song[QLatin1String("#text")].toString();
QString song = json_obj_song["#text"_L1].toString();
int accepted = obj_attr[QLatin1String("accepted")].toVariant().toInt();
int accepted = obj_attr["accepted"_L1].toVariant().toInt();
if (accepted == 1) {
qLog(Debug) << name_ << "Scrobble for" << song << "accepted";
}
@@ -862,8 +864,8 @@ void ScrobblingAPI20::LoveRequestFinished(QNetworkReply *reply) {
return;
}
if (json_obj.contains(QLatin1String("error"))) {
QJsonValue json_value = json_obj[QLatin1String("error")];
if (json_obj.contains("error"_L1)) {
QJsonValue json_value = json_obj["error"_L1];
if (!json_value.isObject()) {
Error(QStringLiteral("Error is not on object."));
return;
@@ -873,21 +875,21 @@ void ScrobblingAPI20::LoveRequestFinished(QNetworkReply *reply) {
Error(QStringLiteral("Received empty json error object."), json_obj);
return;
}
if (json_obj_error.contains(QLatin1String("code")) && json_obj_error.contains(QLatin1String("#text"))) {
int code = json_obj_error[QLatin1String("code")].toInt();
QString text = json_obj_error[QLatin1String("#text")].toString();
if (json_obj_error.contains("code"_L1) && json_obj_error.contains("#text"_L1)) {
int code = json_obj_error["code"_L1].toInt();
QString text = json_obj_error["#text"_L1].toString();
QString error_reason = QStringLiteral("%1 (%2)").arg(text).arg(code);
Error(error_reason);
return;
}
}
if (json_obj.contains(QLatin1String("lfm"))) {
QJsonValue json_value = json_obj[QLatin1String("lfm")];
if (json_obj.contains("lfm"_L1)) {
QJsonValue json_value = json_obj["lfm"_L1];
if (json_value.isObject()) {
QJsonObject json_obj_lfm = json_value.toObject();
if (json_obj_lfm.contains(QLatin1String("status"))) {
QString status = json_obj_lfm[QLatin1String("status")].toString();
if (json_obj_lfm.contains("status"_L1)) {
QString status = json_obj_lfm["status"_L1].toString();
qLog(Debug) << name_ << "Received love status:" << status;
return;
}