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

Remove Disc from album name when scrobbling

Browse Source
This commit is contained in:
Jonas Kvinge
2018-12-26 13:33:56 +01:00
parent ba38ccdbc6
commit e66fe78cbe
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -335,9 +335,12 @@ void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) {
if (!song.is_metadata_good()) return; if (!song.is_metadata_good()) return;
QString album = song.album();
album = album.remove(Song::kCoverRemoveDisc);
QJsonObject object_track_metadata; QJsonObject object_track_metadata;
object_track_metadata.insert("artist_name", QJsonValue::fromVariant(song.artist())); object_track_metadata.insert("artist_name", QJsonValue::fromVariant(song.artist()));
object_track_metadata.insert("release_name", QJsonValue::fromVariant(song.album())); 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(song.title()));
QJsonObject object_listen; QJsonObject object_listen;

5
src/scrobbler/scrobblercache.cpp
View File

@@ -180,7 +180,10 @@ ScrobblerCacheItem *ScrobblerCache::Add(const Song &song, const quint64 &timesta
if (scrobbler_cache_.contains(timestamp)) return nullptr; if (scrobbler_cache_.contains(timestamp)) return nullptr;
ScrobblerCacheItem *item = new ScrobblerCacheItem(song.artist(), song.album(), song.title(), song.albumartist(), song.track(), song.length_nanosec(), timestamp); QString album = song.album();
album = album.remove(Song::kCoverRemoveDisc);
ScrobblerCacheItem *item = new ScrobblerCacheItem(song.artist(), album, song.title(), song.albumartist(), song.track(), song.length_nanosec(), timestamp);
scrobbler_cache_.insert(timestamp, item); scrobbler_cache_.insert(timestamp, item);
if (loaded_) DoInAMinuteOrSo(this, SLOT(WriteCache())); if (loaded_) DoInAMinuteOrSo(this, SLOT(WriteCache()));

7
src/scrobbler/scrobblingapi20.cpp
View File

@@ -383,11 +383,14 @@ void ScrobblingAPI20::UpdateNowPlaying(const Song &song) {
if (!IsAuthenticated() || !song.is_metadata_good()) return; if (!IsAuthenticated() || !song.is_metadata_good()) return;
QString album = song.album();
album = album.remove(Song::kCoverRemoveDisc);
ParamList params = ParamList() ParamList params = ParamList()
<< Param("method", "track.updateNowPlaying") << Param("method", "track.updateNowPlaying")
<< Param("artist", song.artist()) << Param("artist", song.artist())
<< Param("track", song.title()) << Param("track", song.title())
<< Param("album", song.album()); << Param("album", album);
QNetworkReply *reply = CreateRequest(params); QNetworkReply *reply = CreateRequest(params);
NewClosure(reply, SIGNAL(finished()), this, SLOT(UpdateNowPlayingRequestFinished(QNetworkReply*)), reply); NewClosure(reply, SIGNAL(finished()), this, SLOT(UpdateNowPlayingRequestFinished(QNetworkReply*)), reply);
@@ -430,7 +433,7 @@ void ScrobblingAPI20::Scrobble(const Song &song) {
cache()->Add(song, timestamp_); cache()->Add(song, timestamp_);
if (app_->scrobbler()->IsOffline()) return; if (app_->scrobbler()->IsOffline()) return;
if (!IsAuthenticated()) { if (!IsAuthenticated()) {
emit ErrorMessage(QString("Scrobbler %1 is not authenticated!").arg(name_)); emit ErrorMessage(QString("Scrobbler %1 is not authenticated!").arg(name_));
return; return;