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

ListenBrainzScrobbler: Report more info to ListenBrainz

Browse Source 
Report music service, URL, and Spotify ID to ListenBrainz.
ListenBrainz accepts the music service in listen reports, in both a canonical domain format and a human-readable display name format. This commit makes Strawberry report both, for maximum flexibility. I've also set it up to report a shareable track URL for supported streaming services. I am already using this data in my homepage's "Now Playing" widget.

Fixes #1768
This commit is contained in:
Piper McCorkle
2025-06-27 19:31:49 -05:00
committed by Jonas Kvinge
parent e0d61223a4
commit a5f94b608b
6 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -235,6 +235,21 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
object_additional_info.insert("work_mbids"_L1, array_musicbrainz_work_id);
}
if (!metadata.music_service.isEmpty()) {
object_additional_info.insert("music_service"_L1, metadata.music_service);
}
if (!metadata.music_service_name.isEmpty()) {
object_additional_info.insert("music_service_name"_L1, metadata.music_service_name);
}
if (!metadata.share_url.isEmpty()) {
object_additional_info.insert("origin_url"_L1, metadata.share_url);
}
if (!metadata.spotify_id.isEmpty()) {
object_additional_info.insert("spotify_id"_L1, metadata.spotify_id);
}
object_track_metadata.insert("additional_info"_L1, object_additional_info);
return object_track_metadata;

4
src/scrobbler/scrobblemetadata.cpp
View File

@@ -38,4 +38,8 @@ ScrobbleMetadata::ScrobbleMetadata(const Song &song)
musicbrainz_disc_id(song.musicbrainz_disc_id()),
musicbrainz_release_group_id(song.musicbrainz_release_group_id()),
musicbrainz_work_id(song.musicbrainz_work_id()),
music_service(song.is_stream() ? song.DomainForSource() : QString()),
music_service_name(song.is_stream() ? song.DescriptionForSource() : QString()),
share_url(song.ShareURL()),
spotify_id(song.source() == Song::Source::Spotify ? song.song_id() : QString()),
length_nanosec(song.length_nanosec()) {}

4
src/scrobbler/scrobblemetadata.h
View File

@@ -45,6 +45,10 @@ class ScrobbleMetadata {
QString musicbrainz_disc_id;
QString musicbrainz_release_group_id; // release_group_mbid
QString musicbrainz_work_id; // work_mbids
QString music_service;
QString music_service_name;
QString share_url;
QString spotify_id;
qint64 length_nanosec;
QString effective_albumartist() const { return albumartist.isEmpty() ? artist : albumartist; }

16
src/scrobbler/scrobblercache.cpp
View File

@@ -180,6 +180,18 @@ void ScrobblerCache::ReadCache() {
if (json_obj_track.contains("musicbrainz_work_id"_L1)) {
metadata.musicbrainz_work_id = json_obj_track["musicbrainz_work_id"_L1].toString();
}
if (json_obj_track.contains("music_service"_L1)) {
metadata.music_service = json_obj_track["music_service"_L1].toString();
}
if (json_obj_track.contains("music_service_name"_L1)) {
metadata.music_service_name = json_obj_track["music_service_name"_L1].toString();
}
if (json_obj_track.contains("share_url"_L1)) {
metadata.share_url = json_obj_track["share_url"_L1].toString();
}
if (json_obj_track.contains("spotify_id"_L1)) {
metadata.spotify_id = json_obj_track["spotify_id"_L1].toString();
}
ScrobblerCacheItemPtr cache_item = make_shared<ScrobblerCacheItem>(metadata, timestamp);
scrobbler_cache_ << cache_item;
@@ -220,6 +232,10 @@ void ScrobblerCache::WriteCache() {
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("music_service"_L1, QJsonValue::fromVariant(cache_item->metadata.music_service));
object.insert("music_service_name"_L1, QJsonValue::fromVariant(cache_item->metadata.music_service_name));
object.insert("share_url"_L1, QJsonValue::fromVariant(cache_item->metadata.share_url));
object.insert("spotify_id"_L1, QJsonValue::fromVariant(cache_item->metadata.spotify_id));
object.insert("length_nanosec"_L1, QJsonValue::fromVariant(cache_item->metadata.length_nanosec));
array.append(QJsonValue::fromVariant(object));
}