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

124
src/scrobbler/lastfmimport.cpp
View File

@@ -48,6 +48,8 @@
#include "scrobblingapi20.h"
#include "lastfmscrobbler.h"
using namespace Qt::StringLiterals;
namespace {
constexpr int kRequestsDelay = 2000;
}
@@ -155,9 +157,9 @@ QByteArray LastFMImport::GetReplyData(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.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("message"))) {
int error_code = json_obj[QLatin1String("error")].toInt();
QString error_message = json_obj[QLatin1String("message")].toString();
if (json_obj.contains("error"_L1) && json_obj.contains("message"_L1)) {
int error_code = json_obj["error"_L1].toInt();
QString error_message = json_obj["message"_L1].toString();
error = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
}
}
@@ -287,62 +289,62 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in
return;
}
if (json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("message"))) {
int error_code = json_obj[QLatin1String("error")].toInt();
QString error_message = json_obj[QLatin1String("message")].toString();
if (json_obj.contains("error"_L1) && json_obj.contains("message"_L1)) {
int error_code = json_obj["error"_L1].toInt();
QString error_message = json_obj["message"_L1].toString();
QString error_reason = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
Error(error_reason);
return;
}
if (!json_obj.contains(QLatin1String("recenttracks"))) {
if (!json_obj.contains("recenttracks"_L1)) {
Error(QStringLiteral("JSON reply from server is missing recenttracks."), json_obj);
return;
}
if (!json_obj[QLatin1String("recenttracks")].isObject()) {
if (!json_obj["recenttracks"_L1].isObject()) {
Error(QStringLiteral("Failed to parse JSON: recenttracks is not an object!"), json_obj);
return;
}
json_obj = json_obj[QLatin1String("recenttracks")].toObject();
json_obj = json_obj["recenttracks"_L1].toObject();
if (!json_obj.contains(QLatin1String("@attr"))) {
if (!json_obj.contains("@attr"_L1)) {
Error(QStringLiteral("JSON reply from server is missing @attr."), json_obj);
return;
}
if (!json_obj.contains(QLatin1String("track"))) {
if (!json_obj.contains("track"_L1)) {
Error(QStringLiteral("JSON reply from server is missing track."), json_obj);
return;
}
if (!json_obj[QLatin1String("@attr")].isObject()) {
if (!json_obj["@attr"_L1].isObject()) {
Error(QStringLiteral("Failed to parse JSON: @attr is not an object."), json_obj);
return;
}
if (!json_obj[QLatin1String("track")].isArray()) {
if (!json_obj["track"_L1].isArray()) {
Error(QStringLiteral("Failed to parse JSON: track is not an object."), json_obj);
return;
}
QJsonObject obj_attr = json_obj[QLatin1String("@attr")].toObject();
QJsonObject obj_attr = json_obj["@attr"_L1].toObject();
if (!obj_attr.contains(QLatin1String("page"))) {
if (!obj_attr.contains("page"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing page."), json_obj);
return;
}
if (!obj_attr.contains(QLatin1String("totalPages"))) {
if (!obj_attr.contains("totalPages"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing totalPages."), json_obj);
return;
}
if (!obj_attr.contains(QLatin1String("total"))) {
if (!obj_attr.contains("total"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing total."), json_obj);
return;
}
int total = obj_attr[QLatin1String("total")].toString().toInt();
int pages = obj_attr[QLatin1String("totalPages")].toString().toInt();
int total = obj_attr["total"_L1].toString().toInt();
int pages = obj_attr["totalPages"_L1].toString().toInt();
if (page == 0) {
lastplayed_total_ = total;
@@ -351,7 +353,7 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in
}
else {
const QJsonArray array_track = json_obj[QLatin1String("track")].toArray();
const QJsonArray array_track = json_obj["track"_L1].toArray();
for (const QJsonValue &value_track : array_track) {
@@ -361,29 +363,29 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in
continue;
}
QJsonObject obj_track = value_track.toObject();
if (!obj_track.contains(QLatin1String("artist")) ||
!obj_track.contains(QLatin1String("album")) ||
!obj_track.contains(QLatin1String("name")) ||
!obj_track.contains(QLatin1String("date")) ||
!obj_track[QLatin1String("artist")].isObject() ||
!obj_track[QLatin1String("album")].isObject() ||
!obj_track[QLatin1String("date")].isObject()
if (!obj_track.contains("artist"_L1) ||
!obj_track.contains("album"_L1) ||
!obj_track.contains("name"_L1) ||
!obj_track.contains("date"_L1) ||
!obj_track["artist"_L1].isObject() ||
!obj_track["album"_L1].isObject() ||
!obj_track["date"_L1].isObject()
) {
continue;
}
QJsonObject obj_artist = obj_track[QLatin1String("artist")].toObject();
QJsonObject obj_album = obj_track[QLatin1String("album")].toObject();
QJsonObject obj_date = obj_track[QLatin1String("date")].toObject();
QJsonObject obj_artist = obj_track["artist"_L1].toObject();
QJsonObject obj_album = obj_track["album"_L1].toObject();
QJsonObject obj_date = obj_track["date"_L1].toObject();
if (!obj_artist.contains(QLatin1String("#text")) || !obj_album.contains(QLatin1String("#text")) || !obj_date.contains(QLatin1String("#text"))) {
if (!obj_artist.contains("#text"_L1) || !obj_album.contains("#text"_L1) || !obj_date.contains("#text"_L1)) {
continue;
}
QString artist = obj_artist[QLatin1String("#text")].toString();
QString album = obj_album[QLatin1String("#text")].toString();
QString date = obj_date[QLatin1String("#text")].toString();
QString title = obj_track[QLatin1String("name")].toString();
QString artist = obj_artist["#text"_L1].toString();
QString album = obj_album["#text"_L1].toString();
QString date = obj_date["#text"_L1].toString();
QString title = obj_track["name"_L1].toString();
QDateTime datetime = QDateTime::fromString(date, QStringLiteral("dd MMM yyyy, hh:mm"));
if (datetime.isValid()) {
Q_EMIT UpdateLastPlayed(artist, album, title, datetime.toSecsSinceEpoch());
@@ -450,62 +452,62 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p
return;
}
if (json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("message"))) {
int error_code = json_obj[QLatin1String("error")].toInt();
QString error_message = json_obj[QLatin1String("message")].toString();
if (json_obj.contains("error"_L1) && json_obj.contains("message"_L1)) {
int error_code = json_obj["error"_L1].toInt();
QString error_message = json_obj["message"_L1].toString();
QString error_reason = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
Error(error_reason);
return;
}
if (!json_obj.contains(QLatin1String("toptracks"))) {
if (!json_obj.contains("toptracks"_L1)) {
Error(QStringLiteral("JSON reply from server is missing toptracks."), json_obj);
return;
}
if (!json_obj[QLatin1String("toptracks")].isObject()) {
if (!json_obj["toptracks"_L1].isObject()) {
Error(QStringLiteral("Failed to parse JSON: toptracks is not an object!"), json_obj);
return;
}
json_obj = json_obj[QLatin1String("toptracks")].toObject();
json_obj = json_obj["toptracks"_L1].toObject();
if (!json_obj.contains(QLatin1String("@attr"))) {
if (!json_obj.contains("@attr"_L1)) {
Error(QStringLiteral("JSON reply from server is missing @attr."), json_obj);
return;
}
if (!json_obj.contains(QLatin1String("track"))) {
if (!json_obj.contains("track"_L1)) {
Error(QStringLiteral("JSON reply from server is missing track."), json_obj);
return;
}
if (!json_obj[QLatin1String("@attr")].isObject()) {
if (!json_obj["@attr"_L1].isObject()) {
Error(QStringLiteral("Failed to parse JSON: @attr is not an object."), json_obj);
return;
}
if (!json_obj[QLatin1String("track")].isArray()) {
if (!json_obj["track"_L1].isArray()) {
Error(QStringLiteral("Failed to parse JSON: track is not an object."), json_obj);
return;
}
QJsonObject obj_attr = json_obj[QLatin1String("@attr")].toObject();
QJsonObject obj_attr = json_obj["@attr"_L1].toObject();
if (!obj_attr.contains(QLatin1String("page"))) {
if (!obj_attr.contains("page"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing page."), json_obj);
return;
}
if (!obj_attr.contains(QLatin1String("totalPages"))) {
if (!obj_attr.contains("totalPages"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing page."), json_obj);
return;
}
if (!obj_attr.contains(QLatin1String("total"))) {
if (!obj_attr.contains("total"_L1)) {
Error(QStringLiteral("Failed to parse JSON: attr object is missing total."), json_obj);
return;
}
int pages = obj_attr[QLatin1String("totalPages")].toString().toInt();
int total = obj_attr[QLatin1String("total")].toString().toInt();
int pages = obj_attr["totalPages"_L1].toString().toInt();
int total = obj_attr["total"_L1].toString().toInt();
if (page == 0) {
playcount_total_ = total;
@@ -514,7 +516,7 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p
}
else {
QJsonArray array_track = json_obj[QLatin1String("track")].toArray();
QJsonArray array_track = json_obj["track"_L1].toArray();
for (QJsonArray::iterator it = array_track.begin(); it != array_track.end(); ++it) {
const QJsonValue &value_track = *it;
@@ -526,22 +528,22 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p
}
QJsonObject obj_track = value_track.toObject();
if (!obj_track.contains(QLatin1String("artist")) ||
!obj_track.contains(QLatin1String("name")) ||
!obj_track.contains(QLatin1String("playcount")) ||
!obj_track[QLatin1String("artist")].isObject()
if (!obj_track.contains("artist"_L1) ||
!obj_track.contains("name"_L1) ||
!obj_track.contains("playcount"_L1) ||
!obj_track["artist"_L1].isObject()
) {
continue;
}
QJsonObject obj_artist = obj_track[QLatin1String("artist")].toObject();
if (!obj_artist.contains(QLatin1String("name"))) {
QJsonObject obj_artist = obj_track["artist"_L1].toObject();
if (!obj_artist.contains("name"_L1)) {
continue;
}
QString artist = obj_artist[QLatin1String("name")].toString();
QString title = obj_track[QLatin1String("name")].toString();
int playcount = obj_track[QLatin1String("playcount")].toString().toInt();
QString artist = obj_artist["name"_L1].toString();
QString title = obj_track["name"_L1].toString();
int playcount = obj_track["playcount"_L1].toString().toInt();
if (playcount <= 0) continue;

96
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -57,6 +57,8 @@
#include "scrobblemetadata.h"
#include "listenbrainzscrobbler.h"
using namespace Qt::StringLiterals;
const char *ListenBrainzScrobbler::kName = "ListenBrainz";
const char *ListenBrainzScrobbler::kSettingsGroup = "ListenBrainz";
@@ -250,12 +252,12 @@ ListenBrainzScrobbler::ReplyResult ListenBrainzScrobbler::GetJsonObject(QNetwork
if (reply->error() == QNetworkReply::NoError || reply->error() >= 200) {
const QByteArray data = reply->readAll();
if (!data.isEmpty() && ExtractJsonObj(data, json_obj, error_description)) {
if (json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("error_description"))) {
error_description = json_obj[QLatin1String("error_description")].toString();
if (json_obj.contains("error"_L1) && json_obj.contains("error_description"_L1)) {
error_description = json_obj["error_description"_L1].toString();
reply_error_type = ReplyResult::APIError;
}
else if (json_obj.contains(QLatin1String("code")) && json_obj.contains(QLatin1String("error"))) {
error_description = QStringLiteral("%1 (%2)").arg(json_obj[QLatin1String("error")].toString()).arg(json_obj[QLatin1String("code")].toInt());
else if (json_obj.contains("code"_L1) && json_obj.contains("error"_L1)) {
error_description = QStringLiteral("%1 (%2)").arg(json_obj["error"_L1].toString()).arg(json_obj["code"_L1].toInt());
reply_error_type = ReplyResult::APIError;
}
}
@@ -320,16 +322,16 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QLatin1String("access_token")) || !json_obj.contains(QLatin1String("expires_in")) || !json_obj.contains(QLatin1String("token_type"))) {
if (!json_obj.contains("access_token"_L1) || !json_obj.contains("expires_in"_L1) || !json_obj.contains("token_type"_L1)) {
AuthError(QStringLiteral("Json access_token, expires_in or token_type is missing."));
return;
}
access_token_ = json_obj[QLatin1String("access_token")].toString();
expires_in_ = json_obj[QLatin1String("expires_in")].toInt();
token_type_ = json_obj[QLatin1String("token_type")].toString();
if (json_obj.contains(QLatin1String("refresh_token"))) {
refresh_token_ = json_obj[QLatin1String("refresh_token")].toString();
access_token_ = json_obj["access_token"_L1].toString();
expires_in_ = json_obj["expires_in"_L1].toInt();
token_type_ = json_obj["token_type"_L1].toString();
if (json_obj.contains("refresh_token"_L1)) {
refresh_token_ = json_obj["refresh_token"_L1].toString();
}
login_time_ = QDateTime::currentSecsSinceEpoch();
@@ -374,42 +376,42 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
QJsonObject object_track_metadata;
if (prefer_albumartist_) {
object_track_metadata.insert(QLatin1String("artist_name"), QJsonValue::fromVariant(metadata.effective_albumartist()));
object_track_metadata.insert("artist_name"_L1, QJsonValue::fromVariant(metadata.effective_albumartist()));
}
else {
object_track_metadata.insert(QLatin1String("artist_name"), QJsonValue::fromVariant(metadata.artist));
object_track_metadata.insert("artist_name"_L1, QJsonValue::fromVariant(metadata.artist));
}
if (!metadata.album.isEmpty()) {
object_track_metadata.insert(QLatin1String("release_name"), QJsonValue::fromVariant(StripAlbum(metadata.album)));
object_track_metadata.insert("release_name"_L1, QJsonValue::fromVariant(StripAlbum(metadata.album)));
}
object_track_metadata.insert(QLatin1String("track_name"), QJsonValue::fromVariant(StripTitle(metadata.title)));
object_track_metadata.insert("track_name"_L1, QJsonValue::fromVariant(StripTitle(metadata.title)));
QJsonObject object_additional_info;
if (metadata.length_nanosec > 0) {
object_additional_info.insert(QLatin1String("duration_ms"), metadata.length_nanosec / kNsecPerMsec);
object_additional_info.insert("duration_ms"_L1, metadata.length_nanosec / kNsecPerMsec);
}
if (metadata.track > 0) {
object_additional_info.insert(QLatin1String("tracknumber"), metadata.track);
object_additional_info.insert("tracknumber"_L1, metadata.track);
}
object_additional_info.insert(QLatin1String("media_player"), QCoreApplication::applicationName());
object_additional_info.insert(QLatin1String("media_player_version"), QCoreApplication::applicationVersion());
object_additional_info.insert(QLatin1String("submission_client"), QCoreApplication::applicationName());
object_additional_info.insert(QLatin1String("submission_client_version"), QCoreApplication::applicationVersion());
object_additional_info.insert("media_player"_L1, QCoreApplication::applicationName());
object_additional_info.insert("media_player_version"_L1, QCoreApplication::applicationVersion());
object_additional_info.insert("submission_client"_L1, QCoreApplication::applicationName());
object_additional_info.insert("submission_client_version"_L1, QCoreApplication::applicationVersion());
QStringList artist_mbids_list;
if (!metadata.musicbrainz_album_artist_id.isEmpty()) {
artist_mbids_list << metadata.musicbrainz_album_artist_id.split(QLatin1Char('/'));
artist_mbids_list << metadata.musicbrainz_album_artist_id.split(u'/');
}
if (!metadata.musicbrainz_artist_id.isEmpty()) {
artist_mbids_list << metadata.musicbrainz_artist_id.split(QLatin1Char('/'));
artist_mbids_list << metadata.musicbrainz_artist_id.split(u'/');
}
if (!metadata.musicbrainz_original_artist_id.isEmpty()) {
artist_mbids_list << metadata.musicbrainz_original_artist_id.split(QLatin1Char('/'));
artist_mbids_list << metadata.musicbrainz_original_artist_id.split(u'/');
}
if (!artist_mbids_list.isEmpty()) {
QJsonArray artist_mbids_array;
@@ -419,33 +421,33 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
}
}
if (!artist_mbids_array.isEmpty()) {
object_additional_info.insert(QLatin1String("artist_mbids"), artist_mbids_array);
object_additional_info.insert("artist_mbids"_L1, artist_mbids_array);
}
}
if (!metadata.musicbrainz_album_id.isEmpty()) {
object_additional_info.insert(QLatin1String("release_mbid"), metadata.musicbrainz_album_id);
object_additional_info.insert("release_mbid"_L1, metadata.musicbrainz_album_id);
}
else if (!metadata.musicbrainz_original_album_id.isEmpty()) {
object_additional_info.insert(QLatin1String("release_mbid"), metadata.musicbrainz_original_album_id);
object_additional_info.insert("release_mbid"_L1, metadata.musicbrainz_original_album_id);
}
if (!metadata.musicbrainz_recording_id.isEmpty()) {
object_additional_info.insert(QLatin1String("recording_mbid"), metadata.musicbrainz_recording_id);
object_additional_info.insert("recording_mbid"_L1, metadata.musicbrainz_recording_id);
}
if (!metadata.musicbrainz_track_id.isEmpty()) {
object_additional_info.insert(QLatin1String("track_mbid"), metadata.musicbrainz_track_id);
object_additional_info.insert("track_mbid"_L1, metadata.musicbrainz_track_id);
}
if (!metadata.musicbrainz_work_id.isEmpty()) {
const QStringList musicbrainz_work_id_list = metadata.musicbrainz_work_id.split(QLatin1Char('/'));
const QStringList musicbrainz_work_id_list = metadata.musicbrainz_work_id.split(u'/');
QJsonArray array_musicbrainz_work_id;
for (const QString &musicbrainz_work_id : musicbrainz_work_id_list) {
array_musicbrainz_work_id << musicbrainz_work_id;
}
object_additional_info.insert(QLatin1String("work_mbids"), array_musicbrainz_work_id);
object_additional_info.insert("work_mbids"_L1, array_musicbrainz_work_id);
}
object_track_metadata.insert(QLatin1String("additional_info"), object_additional_info);
object_track_metadata.insert("additional_info"_L1, object_additional_info);
return object_track_metadata;
@@ -462,12 +464,12 @@ void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) {
if (!song.is_metadata_good() || !authenticated() || settings_->offline()) return;
QJsonObject object_listen;
object_listen.insert(QLatin1String("track_metadata"), JsonTrackMetadata(ScrobbleMetadata(song)));
object_listen.insert("track_metadata"_L1, JsonTrackMetadata(ScrobbleMetadata(song)));
QJsonArray array_payload;
array_payload.append(object_listen);
QJsonObject object;
object.insert(QLatin1String("listen_type"), QLatin1String("playing_now"));
object.insert(QLatin1String("payload"), array_payload);
object.insert("listen_type"_L1, "playing_now"_L1);
object.insert("payload"_L1, array_payload);
QJsonDocument doc(object);
QUrl url(QStringLiteral("%1/1/submit-listens").arg(QLatin1String(kApiUrl)));
@@ -490,13 +492,13 @@ void ListenBrainzScrobbler::UpdateNowPlayingRequestFinished(QNetworkReply *reply
return;
}
if (!json_obj.contains(QLatin1String("status"))) {
if (!json_obj.contains("status"_L1)) {
Error(QStringLiteral("Now playing request is missing status from server."));
return;
}
QString status = json_obj[QLatin1String("status")].toString();
if (status.compare(QLatin1String("ok"), Qt::CaseInsensitive) != 0) {
QString status = json_obj["status"_L1].toString();
if (status.compare("ok"_L1, Qt::CaseInsensitive) != 0) {
Error(QStringLiteral("Received %1 status for now playing.").arg(status));
}
@@ -558,8 +560,8 @@ void ListenBrainzScrobbler::Submit() {
cache_item->sent = true;
cache_items_sent << cache_item;
QJsonObject object_listen;
object_listen.insert(QLatin1String("listened_at"), QJsonValue::fromVariant(cache_item->timestamp));
object_listen.insert(QLatin1String("track_metadata"), JsonTrackMetadata(cache_item->metadata));
object_listen.insert("listened_at"_L1, QJsonValue::fromVariant(cache_item->timestamp));
object_listen.insert("track_metadata"_L1, JsonTrackMetadata(cache_item->metadata));
array.append(QJsonValue::fromVariant(object_listen));
if (cache_items_sent.count() >= kScrobblesPerRequest || cache_item->error) break;
}
@@ -569,8 +571,8 @@ void ListenBrainzScrobbler::Submit() {
submitted_ = true;
QJsonObject object;
object.insert(QLatin1String("listen_type"), QLatin1String("import"));
object.insert(QLatin1String("payload"), array);
object.insert("listen_type"_L1, "import"_L1);
object.insert("payload"_L1, array);
QJsonDocument doc(object);
QUrl url(QStringLiteral("%1/1/submit-listens").arg(QLatin1String(kApiUrl)));
@@ -592,8 +594,8 @@ void ListenBrainzScrobbler::ScrobbleRequestFinished(QNetworkReply *reply, Scrobb
QString error_message;
const ReplyResult reply_result = GetJsonObject(reply, json_obj, error_message);
if (reply_result == ReplyResult::Success) {
if (json_obj.contains(QLatin1String("status"))) {
QString status = json_obj[QLatin1String("status")].toString();
if (json_obj.contains("status"_L1)) {
QString status = json_obj["status"_L1].toString();
qLog(Debug) << "ListenBrainz: Received scrobble status:" << status;
}
else {
@@ -640,8 +642,8 @@ void ListenBrainzScrobbler::Love() {
qLog(Debug) << "ListenBrainz: Sending love for song" << song_playing_.artist() << song_playing_.album() << song_playing_.title();
QJsonObject object;
object.insert(QLatin1String("recording_mbid"), song_playing_.musicbrainz_recording_id());
object.insert(QLatin1String("score"), 1);
object.insert("recording_mbid"_L1, song_playing_.musicbrainz_recording_id());
object.insert("score"_L1, 1);
QUrl url(QStringLiteral("%1/1/feedback/recording-feedback").arg(QLatin1String(kApiUrl)));
QNetworkReply *reply = CreateRequest(url, QJsonDocument(object));
@@ -663,8 +665,8 @@ void ListenBrainzScrobbler::LoveRequestFinished(QNetworkReply *reply) {
return;
}
if (json_obj.contains(QLatin1String("status"))) {
qLog(Debug) << "ListenBrainz: Received recording-feedback status:" << json_obj[QLatin1String("status")].toString();
if (json_obj.contains("status"_L1)) {
qLog(Debug) << "ListenBrainz: Received recording-feedback status:" << json_obj["status"_L1].toString();
}
}

117
src/scrobbler/scrobblercache.cpp
View File

@@ -42,8 +42,9 @@
#include "scrobblercache.h"
#include "scrobblercacheitem.h"
using std::make_shared;
using namespace std::chrono_literals;
using namespace Qt::StringLiterals;
using std::make_shared;
ScrobblerCache::ScrobblerCache(const QString &filename, QObject *parent)
: QObject(parent),
@@ -96,11 +97,11 @@ void ScrobblerCache::ReadCache() {
qLog(Error) << "Scrobbler cache has empty JSON object.";
return;
}
if (!json_obj.contains(QLatin1String("tracks"))) {
if (!json_obj.contains("tracks"_L1)) {
qLog(Error) << "Scrobbler cache is missing JSON tracks.";
return;
}
QJsonValue json_tracks = json_obj[QLatin1String("tracks")];
QJsonValue json_tracks = json_obj["tracks"_L1];
if (!json_tracks.isArray()) {
qLog(Error) << "Scrobbler cache JSON tracks is not an array.";
return;
@@ -118,13 +119,13 @@ void ScrobblerCache::ReadCache() {
}
QJsonObject json_obj_track = value.toObject();
if (
!json_obj_track.contains(QLatin1String("timestamp")) ||
!json_obj_track.contains(QLatin1String("artist")) ||
!json_obj_track.contains(QLatin1String("album")) ||
!json_obj_track.contains(QLatin1String("title")) ||
!json_obj_track.contains(QLatin1String("track")) ||
!json_obj_track.contains(QLatin1String("albumartist")) ||
!json_obj_track.contains(QLatin1String("length_nanosec"))
!json_obj_track.contains("timestamp"_L1) ||
!json_obj_track.contains("artist"_L1) ||
!json_obj_track.contains("album"_L1) ||
!json_obj_track.contains("title"_L1) ||
!json_obj_track.contains("track"_L1) ||
!json_obj_track.contains("albumartist"_L1) ||
!json_obj_track.contains("length_nanosec"_L1)
) {
qLog(Error) << "Scrobbler cache JSON tracks array value is missing data.";
qLog(Debug) << value;
@@ -132,52 +133,52 @@ void ScrobblerCache::ReadCache() {
}
ScrobbleMetadata metadata;
quint64 timestamp = json_obj_track[QLatin1String("timestamp")].toVariant().toULongLong();
metadata.artist = json_obj_track[QLatin1String("artist")].toString();
metadata.album = json_obj_track[QLatin1String("album")].toString();
metadata.title = json_obj_track[QLatin1String("title")].toString();
metadata.track = json_obj_track[QLatin1String("track")].toInt();
metadata.albumartist = json_obj_track[QLatin1String("albumartist")].toString();
metadata.length_nanosec = json_obj_track[QLatin1String("length_nanosec")].toVariant().toLongLong();
quint64 timestamp = json_obj_track["timestamp"_L1].toVariant().toULongLong();
metadata.artist = json_obj_track["artist"_L1].toString();
metadata.album = json_obj_track["album"_L1].toString();
metadata.title = json_obj_track["title"_L1].toString();
metadata.track = json_obj_track["track"_L1].toInt();
metadata.albumartist = json_obj_track["albumartist"_L1].toString();
metadata.length_nanosec = json_obj_track["length_nanosec"_L1].toVariant().toLongLong();
if (timestamp == 0 || metadata.artist.isEmpty() || metadata.title.isEmpty() || metadata.length_nanosec <= 0) {
qLog(Error) << "Invalid cache data" << "for song" << metadata.title;
continue;
}
if (json_obj_track.contains(QLatin1String("grouping"))) {
metadata.grouping = json_obj_track[QLatin1String("grouping")].toString();
if (json_obj_track.contains("grouping"_L1)) {
metadata.grouping = json_obj_track["grouping"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_album_artist_id"))) {
metadata.musicbrainz_album_artist_id = json_obj_track[QLatin1String("musicbrainz_album_artist_id")].toString();
if (json_obj_track.contains("musicbrainz_album_artist_id"_L1)) {
metadata.musicbrainz_album_artist_id = json_obj_track["musicbrainz_album_artist_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_artist_id"))) {
metadata.musicbrainz_artist_id = json_obj_track[QLatin1String("musicbrainz_artist_id")].toString();
if (json_obj_track.contains("musicbrainz_artist_id"_L1)) {
metadata.musicbrainz_artist_id = json_obj_track["musicbrainz_artist_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_original_artist_id"))) {
metadata.musicbrainz_original_artist_id = json_obj_track[QLatin1String("musicbrainz_original_artist_id")].toString();
if (json_obj_track.contains("musicbrainz_original_artist_id"_L1)) {
metadata.musicbrainz_original_artist_id = json_obj_track["musicbrainz_original_artist_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_album_id"))) {
metadata.musicbrainz_album_id = json_obj_track[QLatin1String("musicbrainz_album_id")].toString();
if (json_obj_track.contains("musicbrainz_album_id"_L1)) {
metadata.musicbrainz_album_id = json_obj_track["musicbrainz_album_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_original_album_id"))) {
metadata.musicbrainz_original_album_id = json_obj_track[QLatin1String("musicbrainz_original_album_id")].toString();
if (json_obj_track.contains("musicbrainz_original_album_id"_L1)) {
metadata.musicbrainz_original_album_id = json_obj_track["musicbrainz_original_album_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_recording_id"))) {
metadata.musicbrainz_recording_id = json_obj_track[QLatin1String("musicbrainz_recording_id")].toString();
if (json_obj_track.contains("musicbrainz_recording_id"_L1)) {
metadata.musicbrainz_recording_id = json_obj_track["musicbrainz_recording_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_track_id"))) {
metadata.musicbrainz_track_id = json_obj_track[QLatin1String("musicbrainz_track_id")].toString();
if (json_obj_track.contains("musicbrainz_track_id"_L1)) {
metadata.musicbrainz_track_id = json_obj_track["musicbrainz_track_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_disc_id"))) {
metadata.musicbrainz_disc_id = json_obj_track[QLatin1String("musicbrainz_disc_id")].toString();
if (json_obj_track.contains("musicbrainz_disc_id"_L1)) {
metadata.musicbrainz_disc_id = json_obj_track["musicbrainz_disc_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_release_group_id"))) {
metadata.musicbrainz_release_group_id = json_obj_track[QLatin1String("musicbrainz_release_group_id")].toString();
if (json_obj_track.contains("musicbrainz_release_group_id"_L1)) {
metadata.musicbrainz_release_group_id = json_obj_track["musicbrainz_release_group_id"_L1].toString();
}
if (json_obj_track.contains(QLatin1String("musicbrainz_work_id"))) {
metadata.musicbrainz_work_id = json_obj_track[QLatin1String("musicbrainz_work_id")].toString();
if (json_obj_track.contains("musicbrainz_work_id"_L1)) {
metadata.musicbrainz_work_id = json_obj_track["musicbrainz_work_id"_L1].toString();
}
ScrobblerCacheItemPtr cache_item = make_shared<ScrobblerCacheItem>(metadata, timestamp);
@@ -202,29 +203,29 @@ void ScrobblerCache::WriteCache() {
QJsonArray array;
for (ScrobblerCacheItemPtr cache_item : std::as_const(scrobbler_cache_)) {
QJsonObject object;
object.insert(QLatin1String("timestamp"), QJsonValue::fromVariant(cache_item->timestamp));
object.insert(QLatin1String("artist"), QJsonValue::fromVariant(cache_item->metadata.artist));
object.insert(QLatin1String("album"), QJsonValue::fromVariant(cache_item->metadata.album));
object.insert(QLatin1String("title"), QJsonValue::fromVariant(cache_item->metadata.title));
object.insert(QLatin1String("track"), QJsonValue::fromVariant(cache_item->metadata.track));
object.insert(QLatin1String("albumartist"), QJsonValue::fromVariant(cache_item->metadata.albumartist));
object.insert(QLatin1String("grouping"), QJsonValue::fromVariant(cache_item->metadata.grouping));
object.insert(QLatin1String("musicbrainz_album_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_artist_id));
object.insert(QLatin1String("musicbrainz_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_artist_id));
object.insert(QLatin1String("musicbrainz_original_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_artist_id));
object.insert(QLatin1String("musicbrainz_album_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_id));
object.insert(QLatin1String("musicbrainz_original_album_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_album_id));
object.insert(QLatin1String("musicbrainz_recording_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_recording_id));
object.insert(QLatin1String("musicbrainz_track_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_track_id));
object.insert(QLatin1String("musicbrainz_disc_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_disc_id));
object.insert(QLatin1String("musicbrainz_release_group_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_release_group_id));
object.insert(QLatin1String("musicbrainz_work_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_work_id));
object.insert(QLatin1String("length_nanosec"), QJsonValue::fromVariant(cache_item->metadata.length_nanosec));
object.insert("timestamp"_L1, QJsonValue::fromVariant(cache_item->timestamp));
object.insert("artist"_L1, QJsonValue::fromVariant(cache_item->metadata.artist));
object.insert("album"_L1, QJsonValue::fromVariant(cache_item->metadata.album));
object.insert("title"_L1, QJsonValue::fromVariant(cache_item->metadata.title));
object.insert("track"_L1, QJsonValue::fromVariant(cache_item->metadata.track));
object.insert("albumartist"_L1, QJsonValue::fromVariant(cache_item->metadata.albumartist));
object.insert("grouping"_L1, QJsonValue::fromVariant(cache_item->metadata.grouping));
object.insert("musicbrainz_album_artist_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_artist_id));
object.insert("musicbrainz_artist_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_artist_id));
object.insert("musicbrainz_original_artist_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_artist_id));
object.insert("musicbrainz_album_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_id));
object.insert("musicbrainz_original_album_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_album_id));
object.insert("musicbrainz_recording_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_recording_id));
object.insert("musicbrainz_track_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_track_id));
object.insert("musicbrainz_disc_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_disc_id));
object.insert("musicbrainz_release_group_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_release_group_id));
object.insert("musicbrainz_work_id"_L1, QJsonValue::fromVariant(cache_item->metadata.musicbrainz_work_id));
object.insert("length_nanosec"_L1, QJsonValue::fromVariant(cache_item->metadata.length_nanosec));
array.append(QJsonValue::fromVariant(object));
}
QJsonObject object;
object.insert(QLatin1String("tracks"), array);
object.insert("tracks"_L1, array);
QJsonDocument doc(object);
QFile file(filename_);

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;
}