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

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_);