Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Strip misc from song title when sending now playing

Browse Source
This commit is contained in:
Jonas Kvinge 2021-05-01 18:19:08 +02:00
parent 2625d72818
commit 2b15dae806
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/scrobbler/listenbrainzscrobbler.cpp
View File

@ -426,8 +426,11 @@ void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) {
if (!song.is_metadata_good() || !IsAuthenticated() || app_->scrobbler()->IsOffline()) return;
QString album = song.album();
QString title = song.title();
album = album.remove(Song::kAlbumRemoveDisc);
album = album.remove(Song::kAlbumRemoveMisc);
title = title.remove(Song::kTitleRemoveMisc);
QJsonObject object_track_metadata;
if (song.albumartist().isEmpty() || song.albumartist().toLower() == Song::kVariousArtists) {
@ -440,7 +443,7 @@ void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) {
if (!album.isEmpty())
object_track_metadata.insert("release_name", QJsonValue::fromVariant(album));
object_track_metadata.insert("track_name", QJsonValue::fromVariant(song.title()));
object_track_metadata.insert("track_name", QJsonValue::fromVariant(title));
QJsonObject object_listen;
object_listen.insert("track_metadata", object_track_metadata);

5
src/scrobbler/scrobblingapi20.cpp
View File

@ -469,13 +469,16 @@ void ScrobblingAPI20::UpdateNowPlaying(const Song &song) {
if (!IsAuthenticated() || !song.is_metadata_good() || app_->scrobbler()->IsOffline()) return;
QString album = song.album();
QString title = song.title();
album = album.remove(Song::kAlbumRemoveDisc);
album = album.remove(Song::kAlbumRemoveMisc);
title = title.remove(Song::kTitleRemoveMisc);
ParamList params = ParamList()
<< Param("method", "track.updateNowPlaying")
<< Param("artist", prefer_albumartist_ && song.effective_albumartist() != Song::kVariousArtists ? song.effective_albumartist() : song.artist())
<< Param("track", song.title());
<< Param("track", title);
if (!album.isEmpty())
params << Param("album", album);