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

Replace QStringLiteral with QLatin1String

Browse Source
This commit is contained in:
Jonas Kvinge
2024-06-12 02:13:27 +02:00
parent 597a8cd6c8
commit b89c200076
73 changed files with 1215 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/scrobbler/lastfmimport.cpp
View File

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

86
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -249,12 +249,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(QStringLiteral("error")) && json_obj.contains(QStringLiteral("error_description"))) {
error_description = json_obj[QStringLiteral("error_description")].toString();
if (json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("error_description"))) {
error_description = json_obj[QLatin1String("error_description")].toString();
reply_error_type = ReplyResult::APIError;
}
else if (json_obj.contains(QStringLiteral("code")) && json_obj.contains(QStringLiteral("error"))) {
error_description = QStringLiteral("%1 (%2)").arg(json_obj[QStringLiteral("error")].toString()).arg(json_obj[QStringLiteral("code")].toInt());
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());
reply_error_type = ReplyResult::APIError;
}
}
@@ -319,16 +319,16 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QStringLiteral("access_token")) || !json_obj.contains(QStringLiteral("expires_in")) || !json_obj.contains(QStringLiteral("token_type"))) {
if (!json_obj.contains(QLatin1String("access_token")) || !json_obj.contains(QLatin1String("expires_in")) || !json_obj.contains(QLatin1String("token_type"))) {
AuthError(QStringLiteral("Json access_token, expires_in or token_type is missing."));
return;
}
access_token_ = json_obj[QStringLiteral("access_token")].toString();
expires_in_ = json_obj[QStringLiteral("expires_in")].toInt();
token_type_ = json_obj[QStringLiteral("token_type")].toString();
if (json_obj.contains(QStringLiteral("refresh_token"))) {
refresh_token_ = json_obj[QStringLiteral("refresh_token")].toString();
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();
}
login_time_ = QDateTime::currentDateTime().toSecsSinceEpoch();
@@ -373,32 +373,32 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
QJsonObject object_track_metadata;
if (prefer_albumartist_) {
object_track_metadata.insert(QStringLiteral("artist_name"), QJsonValue::fromVariant(metadata.effective_albumartist()));
object_track_metadata.insert(QLatin1String("artist_name"), QJsonValue::fromVariant(metadata.effective_albumartist()));
}
else {
object_track_metadata.insert(QStringLiteral("artist_name"), QJsonValue::fromVariant(metadata.artist));
object_track_metadata.insert(QLatin1String("artist_name"), QJsonValue::fromVariant(metadata.artist));
}
if (!metadata.album.isEmpty()) {
object_track_metadata.insert(QStringLiteral("release_name"), QJsonValue::fromVariant(StripAlbum(metadata.album)));
object_track_metadata.insert(QLatin1String("release_name"), QJsonValue::fromVariant(StripAlbum(metadata.album)));
}
object_track_metadata.insert(QStringLiteral("track_name"), QJsonValue::fromVariant(StripTitle(metadata.title)));
object_track_metadata.insert(QLatin1String("track_name"), QJsonValue::fromVariant(StripTitle(metadata.title)));
QJsonObject object_additional_info;
if (metadata.length_nanosec > 0) {
object_additional_info.insert(QStringLiteral("duration_ms"), metadata.length_nanosec / kNsecPerMsec);
object_additional_info.insert(QLatin1String("duration_ms"), metadata.length_nanosec / kNsecPerMsec);
}
if (metadata.track > 0) {
object_additional_info.insert(QStringLiteral("tracknumber"), metadata.track);
object_additional_info.insert(QLatin1String("tracknumber"), metadata.track);
}
object_additional_info.insert(QStringLiteral("media_player"), QCoreApplication::applicationName());
object_additional_info.insert(QStringLiteral("media_player_version"), QCoreApplication::applicationVersion());
object_additional_info.insert(QStringLiteral("submission_client"), QCoreApplication::applicationName());
object_additional_info.insert(QStringLiteral("submission_client_version"), QCoreApplication::applicationVersion());
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());
QStringList artist_mbids_list;
if (!metadata.musicbrainz_album_artist_id.isEmpty()) {
@@ -418,28 +418,28 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
}
}
if (!artist_mbids_array.isEmpty()) {
object_additional_info.insert(QStringLiteral("artist_mbids"), artist_mbids_array);
object_additional_info.insert(QLatin1String("artist_mbids"), artist_mbids_array);
}
}
if (!metadata.musicbrainz_album_id.isEmpty()) {
object_additional_info.insert(QStringLiteral("release_mbid"), metadata.musicbrainz_album_id);
object_additional_info.insert(QLatin1String("release_mbid"), metadata.musicbrainz_album_id);
}
else if (!metadata.musicbrainz_original_album_id.isEmpty()) {
object_additional_info.insert(QStringLiteral("release_mbid"), metadata.musicbrainz_original_album_id);
object_additional_info.insert(QLatin1String("release_mbid"), metadata.musicbrainz_original_album_id);
}
if (!metadata.musicbrainz_recording_id.isEmpty()) {
object_additional_info.insert(QStringLiteral("recording_mbid"), metadata.musicbrainz_recording_id);
object_additional_info.insert(QLatin1String("recording_mbid"), metadata.musicbrainz_recording_id);
}
if (!metadata.musicbrainz_track_id.isEmpty()) {
object_additional_info.insert(QStringLiteral("track_mbid"), metadata.musicbrainz_track_id);
object_additional_info.insert(QLatin1String("track_mbid"), metadata.musicbrainz_track_id);
}
if (!metadata.musicbrainz_work_id.isEmpty()) {
object_additional_info.insert(QStringLiteral("work_mbids"), QJsonArray() << metadata.musicbrainz_work_id);
object_additional_info.insert(QLatin1String("work_mbids"), QJsonArray() << metadata.musicbrainz_work_id);
}
object_track_metadata.insert(QStringLiteral("additional_info"), object_additional_info);
object_track_metadata.insert(QLatin1String("additional_info"), object_additional_info);
return object_track_metadata;
@@ -456,15 +456,15 @@ void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) {
if (!song.is_metadata_good() || !authenticated() || settings_->offline()) return;
QJsonObject object_listen;
object_listen.insert(QStringLiteral("track_metadata"), JsonTrackMetadata(ScrobbleMetadata(song)));
object_listen.insert(QLatin1String("track_metadata"), JsonTrackMetadata(ScrobbleMetadata(song)));
QJsonArray array_payload;
array_payload.append(object_listen);
QJsonObject object;
object.insert(QStringLiteral("listen_type"), QStringLiteral("playing_now"));
object.insert(QStringLiteral("payload"), array_payload);
object.insert(QLatin1String("listen_type"), QLatin1String("playing_now"));
object.insert(QLatin1String("payload"), array_payload);
QJsonDocument doc(object);
QUrl url(QStringLiteral("%1/1/submit-listens").arg(QLatin1String(kApiUrl)));
QUrl url(QLatin1String("%1/1/submit-listens").arg(QLatin1String(kApiUrl)));
QNetworkReply *reply = CreateRequest(url, doc);
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply]() { UpdateNowPlayingRequestFinished(reply); });
@@ -484,12 +484,12 @@ void ListenBrainzScrobbler::UpdateNowPlayingRequestFinished(QNetworkReply *reply
return;
}
if (!json_obj.contains(QStringLiteral("status"))) {
if (!json_obj.contains(QLatin1String("status"))) {
Error(QStringLiteral("Now playing request is missing status from server."));
return;
}
QString status = json_obj[QStringLiteral("status")].toString();
QString status = json_obj[QLatin1String("status")].toString();
if (status.compare(QLatin1String("ok"), Qt::CaseInsensitive) != 0) {
Error(QStringLiteral("Received %1 status for now playing.").arg(status));
}
@@ -552,8 +552,8 @@ void ListenBrainzScrobbler::Submit() {
cache_item->sent = true;
cache_items_sent << cache_item;
QJsonObject object_listen;
object_listen.insert(QStringLiteral("listened_at"), QJsonValue::fromVariant(cache_item->timestamp));
object_listen.insert(QStringLiteral("track_metadata"), JsonTrackMetadata(cache_item->metadata));
object_listen.insert(QLatin1String("listened_at"), QJsonValue::fromVariant(cache_item->timestamp));
object_listen.insert(QLatin1String("track_metadata"), JsonTrackMetadata(cache_item->metadata));
array.append(QJsonValue::fromVariant(object_listen));
if (cache_items_sent.count() >= kScrobblesPerRequest || cache_item->error) break;
}
@@ -563,8 +563,8 @@ void ListenBrainzScrobbler::Submit() {
submitted_ = true;
QJsonObject object;
object.insert(QStringLiteral("listen_type"), QStringLiteral("import"));
object.insert(QStringLiteral("payload"), array);
object.insert(QLatin1String("listen_type"), QLatin1String("import"));
object.insert(QLatin1String("payload"), array);
QJsonDocument doc(object);
QUrl url(QStringLiteral("%1/1/submit-listens").arg(QLatin1String(kApiUrl)));
@@ -586,8 +586,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(QStringLiteral("status"))) {
QString status = json_obj[QStringLiteral("status")].toString();
if (json_obj.contains(QLatin1String("status"))) {
QString status = json_obj[QLatin1String("status")].toString();
qLog(Debug) << "ListenBrainz: Received scrobble status:" << status;
}
else {
@@ -634,8 +634,8 @@ void ListenBrainzScrobbler::Love() {
qLog(Debug) << "ListenBrainz: Sending love for song" << song_playing_.artist() << song_playing_.album() << song_playing_.title();
QJsonObject object;
object.insert(QStringLiteral("recording_mbid"), song_playing_.musicbrainz_recording_id());
object.insert(QStringLiteral("score"), 1);
object.insert(QLatin1String("recording_mbid"), song_playing_.musicbrainz_recording_id());
object.insert(QLatin1String("score"), 1);
QUrl url(QStringLiteral("%1/1/feedback/recording-feedback").arg(QLatin1String(kApiUrl)));
QNetworkReply *reply = CreateRequest(url, QJsonDocument(object));
@@ -657,8 +657,8 @@ void ListenBrainzScrobbler::LoveRequestFinished(QNetworkReply *reply) {
return;
}
if (json_obj.contains(QStringLiteral("status"))) {
qLog(Debug) << "ListenBrainz: Received recording-feedback status:" << json_obj[QStringLiteral("status")].toString();
if (json_obj.contains(QLatin1String("status"))) {
qLog(Debug) << "ListenBrainz: Received recording-feedback status:" << json_obj[QLatin1String("status")].toString();
}
}

114
src/scrobbler/scrobblercache.cpp
View File

@@ -99,11 +99,11 @@ void ScrobblerCache::ReadCache() {
qLog(Error) << "Scrobbler cache has empty JSON object.";
return;
}
if (!json_obj.contains(QStringLiteral("tracks"))) {
if (!json_obj.contains(QLatin1String("tracks"))) {
qLog(Error) << "Scrobbler cache is missing JSON tracks.";
return;
}
QJsonValue json_tracks = json_obj[QStringLiteral("tracks")];
QJsonValue json_tracks = json_obj[QLatin1String("tracks")];
if (!json_tracks.isArray()) {
qLog(Error) << "Scrobbler cache JSON tracks is not an array.";
return;
@@ -121,13 +121,13 @@ void ScrobblerCache::ReadCache() {
}
QJsonObject json_obj_track = value.toObject();
if (
!json_obj_track.contains(QStringLiteral("timestamp")) ||
!json_obj_track.contains(QStringLiteral("artist")) ||
!json_obj_track.contains(QStringLiteral("album")) ||
!json_obj_track.contains(QStringLiteral("title")) ||
!json_obj_track.contains(QStringLiteral("track")) ||
!json_obj_track.contains(QStringLiteral("albumartist")) ||
!json_obj_track.contains(QStringLiteral("length_nanosec"))
!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"))
) {
qLog(Error) << "Scrobbler cache JSON tracks array value is missing data.";
qLog(Debug) << value;
@@ -135,52 +135,52 @@ void ScrobblerCache::ReadCache() {
}
ScrobbleMetadata metadata;
quint64 timestamp = json_obj_track[QStringLiteral("timestamp")].toVariant().toULongLong();
metadata.artist = json_obj_track[QStringLiteral("artist")].toString();
metadata.album = json_obj_track[QStringLiteral("album")].toString();
metadata.title = json_obj_track[QStringLiteral("title")].toString();
metadata.track = json_obj_track[QStringLiteral("track")].toInt();
metadata.albumartist = json_obj_track[QStringLiteral("albumartist")].toString();
metadata.length_nanosec = json_obj_track[QStringLiteral("length_nanosec")].toVariant().toLongLong();
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();
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(QStringLiteral("grouping"))) {
metadata.grouping = json_obj_track[QStringLiteral("grouping")].toString();
if (json_obj_track.contains(QLatin1String("grouping"))) {
metadata.grouping = json_obj_track[QLatin1String("grouping")].toString();
}
if (json_obj_track.contains(QStringLiteral("musicbrainz_album_artist_id"))) {
metadata.musicbrainz_album_artist_id = json_obj_track[QStringLiteral("musicbrainz_album_artist_id")].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(QStringLiteral("musicbrainz_artist_id"))) {
metadata.musicbrainz_artist_id = json_obj_track[QStringLiteral("musicbrainz_artist_id")].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(QStringLiteral("musicbrainz_original_artist_id"))) {
metadata.musicbrainz_original_artist_id = json_obj_track[QStringLiteral("musicbrainz_original_artist_id")].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(QStringLiteral("musicbrainz_album_id"))) {
metadata.musicbrainz_album_id = json_obj_track[QStringLiteral("musicbrainz_album_id")].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(QStringLiteral("musicbrainz_original_album_id"))) {
metadata.musicbrainz_original_album_id = json_obj_track[QStringLiteral("musicbrainz_original_album_id")].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(QStringLiteral("musicbrainz_recording_id"))) {
metadata.musicbrainz_recording_id = json_obj_track[QStringLiteral("musicbrainz_recording_id")].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(QStringLiteral("musicbrainz_track_id"))) {
metadata.musicbrainz_track_id = json_obj_track[QStringLiteral("musicbrainz_track_id")].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(QStringLiteral("musicbrainz_disc_id"))) {
metadata.musicbrainz_disc_id = json_obj_track[QStringLiteral("musicbrainz_disc_id")].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(QStringLiteral("musicbrainz_release_group_id"))) {
metadata.musicbrainz_release_group_id = json_obj_track[QStringLiteral("musicbrainz_release_group_id")].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(QStringLiteral("musicbrainz_work_id"))) {
metadata.musicbrainz_work_id = json_obj_track[QStringLiteral("musicbrainz_work_id")].toString();
if (json_obj_track.contains(QLatin1String("musicbrainz_work_id"))) {
metadata.musicbrainz_work_id = json_obj_track[QLatin1String("musicbrainz_work_id")].toString();
}
ScrobblerCacheItemPtr cache_item = make_shared<ScrobblerCacheItem>(metadata, timestamp);
@@ -205,29 +205,29 @@ void ScrobblerCache::WriteCache() {
QJsonArray array;
for (ScrobblerCacheItemPtr cache_item : scrobbler_cache_) {
QJsonObject object;
object.insert(QStringLiteral("timestamp"), QJsonValue::fromVariant(cache_item->timestamp));
object.insert(QStringLiteral("artist"), QJsonValue::fromVariant(cache_item->metadata.artist));
object.insert(QStringLiteral("album"), QJsonValue::fromVariant(cache_item->metadata.album));
object.insert(QStringLiteral("title"), QJsonValue::fromVariant(cache_item->metadata.title));
object.insert(QStringLiteral("track"), QJsonValue::fromVariant(cache_item->metadata.track));
object.insert(QStringLiteral("albumartist"), QJsonValue::fromVariant(cache_item->metadata.albumartist));
object.insert(QStringLiteral("grouping"), QJsonValue::fromVariant(cache_item->metadata.grouping));
object.insert(QStringLiteral("musicbrainz_album_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_artist_id));
object.insert(QStringLiteral("musicbrainz_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_artist_id));
object.insert(QStringLiteral("musicbrainz_original_artist_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_artist_id));
object.insert(QStringLiteral("musicbrainz_album_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_album_id));
object.insert(QStringLiteral("musicbrainz_original_album_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_original_album_id));
object.insert(QStringLiteral("musicbrainz_recording_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_recording_id));
object.insert(QStringLiteral("musicbrainz_track_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_track_id));
object.insert(QStringLiteral("musicbrainz_disc_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_disc_id));
object.insert(QStringLiteral("musicbrainz_release_group_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_release_group_id));
object.insert(QStringLiteral("musicbrainz_work_id"), QJsonValue::fromVariant(cache_item->metadata.musicbrainz_work_id));
object.insert(QStringLiteral("length_nanosec"), QJsonValue::fromVariant(cache_item->metadata.length_nanosec));
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));
array.append(QJsonValue::fromVariant(object));
}
QJsonObject object;
object.insert(QStringLiteral("tracks"), array);
object.insert(QLatin1String("tracks"), array);
QJsonDocument doc(object);
QFile file(filename_);

118
src/scrobbler/scrobblingapi20.cpp
View File

@@ -170,9 +170,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(QStringLiteral("error")) && json_obj.contains(QStringLiteral("message"))) {
error_code = json_obj[QStringLiteral("error")].toInt();
QString error_message = json_obj[QStringLiteral("message")].toString();
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();
error_description = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
reply_error_type = ReplyResult::APIError;
}
@@ -220,7 +220,7 @@ void ScrobblingAPI20::Authenticate() {
if (openurl_result) {
break;
}
QMessageBox messagebox_error(QMessageBox::Warning, tr("%1 Scrobbler Authentication").arg(name_), tr("Could not open URL. Please open this URL in your browser") + QStringLiteral(":<br /><a href=\"%1\">%1</a>").arg(url.toString()), QMessageBox::Ok);
QMessageBox messagebox_error(QMessageBox::Warning, tr("%1 Scrobbler Authentication").arg(name_), tr("Could not open URL. Please open this URL in your browser") + QLatin1String(":<br /><a href=\"%1\">%1</a>").arg(url.toString()), QMessageBox::Ok);
messagebox_error.setTextFormat(Qt::RichText);
messagebox_error.exec();
}
@@ -311,12 +311,12 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QStringLiteral("session"))) {
if (!json_obj.contains(QLatin1String("session"))) {
AuthError(QStringLiteral("Json reply from server is missing session."));
return;
}
QJsonValue json_session = json_obj[QStringLiteral("session")];
QJsonValue json_session = json_obj[QLatin1String("session")];
if (!json_session.isObject()) {
AuthError(QStringLiteral("Json session is not an object."));
return;
@@ -326,14 +326,14 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) {
AuthError(QStringLiteral("Json session object is empty."));
return;
}
if (!json_obj.contains(QStringLiteral("subscriber")) || !json_obj.contains(QStringLiteral("name")) || !json_obj.contains(QStringLiteral("key"))) {
if (!json_obj.contains(QLatin1String("subscriber")) || !json_obj.contains(QLatin1String("name")) || !json_obj.contains(QLatin1String("key"))) {
AuthError(QStringLiteral("Json session object is missing values."));
return;
}
subscriber_ = json_obj[QStringLiteral("subscriber")].toBool();
username_ = json_obj[QStringLiteral("name")].toString();
session_key_ = json_obj[QStringLiteral("key")].toString();
subscriber_ = json_obj[QLatin1String("subscriber")].toBool();
username_ = json_obj[QLatin1String("name")].toString();
session_key_ = json_obj[QLatin1String("key")].toString();
Settings s;
s.beginGroup(settings_group_);
@@ -429,7 +429,7 @@ void ScrobblingAPI20::UpdateNowPlayingRequestFinished(QNetworkReply *reply) {
return;
}
if (!json_obj.contains(QStringLiteral("nowplaying"))) {
if (!json_obj.contains(QLatin1String("nowplaying"))) {
Error(QStringLiteral("Json reply from server is missing nowplaying."), json_obj);
return;
}
@@ -508,13 +508,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(QStringLiteral("album")).arg(i), StripAlbum(cache_item->metadata.album));
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("album")).arg(i), StripAlbum(cache_item->metadata.album));
}
if (!prefer_albumartist_ && !cache_item->metadata.albumartist.isEmpty()) {
params << Param(QStringLiteral("%1[%2]").arg(QStringLiteral("albumArtist")).arg(i), cache_item->metadata.albumartist);
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("albumArtist")).arg(i), cache_item->metadata.albumartist);
}
if (cache_item->metadata.track > 0) {
params << Param(QStringLiteral("%1[%2]").arg(QStringLiteral("trackNumber")).arg(i), QString::number(cache_item->metadata.track));
params << Param(QStringLiteral("%1[%2]").arg(QLatin1String("trackNumber")).arg(i), QString::number(cache_item->metadata.track));
}
++i;
if (cache_items_sent.count() >= kScrobblesPerRequest) break;
@@ -551,13 +551,13 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
cache_->Flush(cache_items);
submit_error_ = false;
if (!json_obj.contains(QStringLiteral("scrobbles"))) {
if (!json_obj.contains(QLatin1String("scrobbles"))) {
Error(QStringLiteral("Json reply from server is missing scrobbles."), json_obj);
StartSubmit();
return;
}
QJsonValue value_scrobbles = json_obj[QStringLiteral("scrobbles")];
QJsonValue value_scrobbles = json_obj[QLatin1String("scrobbles")];
if (!value_scrobbles.isObject()) {
Error(QStringLiteral("Json scrobbles is not an object."), json_obj);
StartSubmit();
@@ -569,13 +569,13 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
StartSubmit();
return;
}
if (!json_obj.contains(QStringLiteral("@attr")) || !json_obj.contains(QStringLiteral("scrobble"))) {
if (!json_obj.contains(QLatin1String("@attr")) || !json_obj.contains(QLatin1String("scrobble"))) {
Error(QStringLiteral("Json scrobbles object is missing values."), json_obj);
StartSubmit();
return;
}
QJsonValue value_attr = json_obj[QStringLiteral("@attr")];
QJsonValue value_attr = json_obj[QLatin1String("@attr")];
if (!value_attr.isObject()) {
Error(QStringLiteral("Json scrobbles attr is not an object."), value_attr);
StartSubmit();
@@ -587,19 +587,19 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
StartSubmit();
return;
}
if (!obj_attr.contains(QStringLiteral("accepted")) || !obj_attr.contains(QStringLiteral("ignored"))) {
if (!obj_attr.contains(QLatin1String("accepted")) || !obj_attr.contains(QLatin1String("ignored"))) {
Error(QStringLiteral("Json scrobbles attr is missing values."), obj_attr);
StartSubmit();
return;
}
int accepted = obj_attr[QStringLiteral("accepted")].toInt();
int ignored = obj_attr[QStringLiteral("ignored")].toInt();
int accepted = obj_attr[QLatin1String("accepted")].toInt();
int ignored = obj_attr[QLatin1String("ignored")].toInt();
qLog(Debug) << name_ << "Scrobbles accepted:" << accepted << "ignored:" << ignored;
QJsonArray array_scrobble;
QJsonValue value_scrobble = json_obj[QStringLiteral("scrobble")];
QJsonValue value_scrobble = json_obj[QLatin1String("scrobble")];
if (value_scrobble.isObject()) {
QJsonObject obj_scrobble = value_scrobble.toObject();
if (obj_scrobble.isEmpty()) {
@@ -634,22 +634,22 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
continue;
}
if (!json_track.contains(QStringLiteral("artist")) ||
!json_track.contains(QStringLiteral("album")) ||
!json_track.contains(QStringLiteral("albumArtist")) ||
!json_track.contains(QStringLiteral("track")) ||
!json_track.contains(QStringLiteral("timestamp")) ||
!json_track.contains(QStringLiteral("ignoredMessage"))
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"))
) {
Error(QStringLiteral("Json scrobbles scrobble is missing values."), json_track);
continue;
}
QJsonValue value_artist = json_track[QStringLiteral("artist")];
QJsonValue value_album = json_track[QStringLiteral("album")];
QJsonValue value_song = json_track[QStringLiteral("track")];
QJsonValue value_ignoredmessage = json_track[QStringLiteral("ignoredMessage")];
//quint64 timestamp = json_track["timestamp"].toVariant().toULongLong();
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")];
//quint64 timestamp = json_track[QLatin1String("timestamp")].toVariant().toULongLong();
if (!value_artist.isObject() || !value_album.isObject() || !value_song.isObject() || !value_ignoredmessage.isObject()) {
Error(QStringLiteral("Json scrobbles scrobble values are not objects."), json_track);
@@ -666,15 +666,15 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
continue;
}
if (!obj_artist.contains(QStringLiteral("#text")) || !obj_album.contains(QStringLiteral("#text")) || !obj_song.contains(QStringLiteral("#text"))) {
if (!obj_artist.contains(QLatin1String("#text")) || !obj_album.contains(QLatin1String("#text")) || !obj_song.contains(QLatin1String("#text"))) {
continue;
}
//QString artist = obj_artist["#text"].toString();
//QString album = obj_album["#text"].toString();
QString song = obj_song[QStringLiteral("#text")].toString();
bool ignoredmessage = obj_ignoredmessage[QStringLiteral("code")].toVariant().toBool();
QString ignoredmessage_text = obj_ignoredmessage[QStringLiteral("#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();
if (ignoredmessage) {
Error(QStringLiteral("Scrobble for \"%1\" ignored: %2").arg(song, ignoredmessage_text));
@@ -728,7 +728,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!json_obj.contains(QStringLiteral("scrobbles"))) {
if (!json_obj.contains(QLatin1String("scrobbles"))) {
Error(QStringLiteral("Json reply from server is missing scrobbles."), json_obj);
cache_item->sent = false;
return;
@@ -736,7 +736,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
cache_->Remove(cache_item);
QJsonValue value_scrobbles = json_obj[QStringLiteral("scrobbles")];
QJsonValue value_scrobbles = json_obj[QLatin1String("scrobbles")];
if (!value_scrobbles.isObject()) {
Error(QStringLiteral("Json scrobbles is not an object."), json_obj);
return;
@@ -746,12 +746,12 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
Error(QStringLiteral("Json scrobbles object is empty."), value_scrobbles);
return;
}
if (!json_obj.contains(QStringLiteral("@attr")) || !json_obj.contains(QStringLiteral("scrobble"))) {
if (!json_obj.contains(QLatin1String("@attr")) || !json_obj.contains(QLatin1String("scrobble"))) {
Error(QStringLiteral("Json scrobbles object is missing values."), json_obj);
return;
}
QJsonValue value_attr = json_obj[QStringLiteral("@attr")];
QJsonValue value_attr = json_obj[QLatin1String("@attr")];
if (!value_attr.isObject()) {
Error(QStringLiteral("Json scrobbles attr is not an object."), value_attr);
return;
@@ -762,7 +762,7 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
QJsonValue value_scrobble = json_obj[QStringLiteral("scrobble")];
QJsonValue value_scrobble = json_obj[QLatin1String("scrobble")];
if (!value_scrobble.isObject()) {
Error(QStringLiteral("Json scrobbles scrobble is not an object."), value_scrobble);
return;
@@ -773,19 +773,19 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!obj_attr.contains(QStringLiteral("accepted")) || !obj_attr.contains(QStringLiteral("ignored"))) {
if (!obj_attr.contains(QLatin1String("accepted")) || !obj_attr.contains(QLatin1String("ignored"))) {
Error(QStringLiteral("Json scrobbles attr is missing values."), obj_attr);
return;
}
if (!json_obj_scrobble.contains(QStringLiteral("artist")) || !json_obj_scrobble.contains(QStringLiteral("album")) || !json_obj_scrobble.contains(QStringLiteral("albumArtist")) || !json_obj_scrobble.contains(QStringLiteral("track")) || !json_obj_scrobble.contains(QStringLiteral("timestamp"))) {
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"))) {
Error(QStringLiteral("Json scrobbles scrobble is missing values."), json_obj_scrobble);
return;
}
QJsonValue json_value_artist = json_obj_scrobble[QStringLiteral("artist")];
QJsonValue json_value_album = json_obj_scrobble[QStringLiteral("album")];
QJsonValue json_value_song = json_obj_scrobble[QStringLiteral("track")];
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")];
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);
@@ -801,16 +801,16 @@ void ScrobblingAPI20::SingleScrobbleRequestFinished(QNetworkReply *reply, Scrobb
return;
}
if (!json_obj_artist.contains(QStringLiteral("#text")) || !json_obj_album.contains(QStringLiteral("#text")) || !json_obj_song.contains(QStringLiteral("#text"))) {
if (!json_obj_artist.contains(QLatin1String("#text")) || !json_obj_album.contains(QLatin1String("#text")) || !json_obj_song.contains(QLatin1String("#text"))) {
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[QStringLiteral("#text")].toString();
QString song = json_obj_song[QLatin1String("#text")].toString();
int accepted = obj_attr[QStringLiteral("accepted")].toVariant().toInt();
int accepted = obj_attr[QLatin1String("accepted")].toVariant().toInt();
if (accepted == 1) {
qLog(Debug) << name_ << "Scrobble for" << song << "accepted";
}
@@ -860,8 +860,8 @@ void ScrobblingAPI20::LoveRequestFinished(QNetworkReply *reply) {
return;
}
if (json_obj.contains(QStringLiteral("error"))) {
QJsonValue json_value = json_obj[QStringLiteral("error")];
if (json_obj.contains(QLatin1String("error"))) {
QJsonValue json_value = json_obj[QLatin1String("error")];
if (!json_value.isObject()) {
Error(QStringLiteral("Error is not on object."));
return;
@@ -871,21 +871,21 @@ void ScrobblingAPI20::LoveRequestFinished(QNetworkReply *reply) {
Error(QStringLiteral("Received empty json error object."), json_obj);
return;
}
if (json_obj_error.contains(QStringLiteral("code")) && json_obj_error.contains(QStringLiteral("#text"))) {
int code = json_obj_error[QStringLiteral("code")].toInt();
QString text = json_obj_error[QStringLiteral("#text")].toString();
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();
QString error_reason = QStringLiteral("%1 (%2)").arg(text).arg(code);
Error(error_reason);
return;
}
}
if (json_obj.contains(QStringLiteral("lfm"))) {
QJsonValue json_value = json_obj[QStringLiteral("lfm")];
if (json_obj.contains(QLatin1String("lfm"))) {
QJsonValue json_value = json_obj[QLatin1String("lfm")];
if (json_value.isObject()) {
QJsonObject json_obj_lfm = json_value.toObject();
if (json_obj_lfm.contains(QStringLiteral("status"))) {
QString status = json_obj_lfm[QStringLiteral("status")].toString();
if (json_obj_lfm.contains(QLatin1String("status"))) {
QString status = json_obj_lfm[QLatin1String("status")].toString();
qLog(Debug) << name_ << "Received love status:" << status;
return;
}