MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID 

Fixes #1498
This commit is contained in:
Philipp Wolfer 2021-06-16 17:09:09 +02:00 committed by Georg Krause
parent 0ad17b4bc3
commit 572efc792e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/funkwhale_api/contrib/scrobbler/scrobbler.py
View File

@ -90,7 +90,7 @@ def get_scrobble_payload(track, date, suffix="[0]"):
"l{}".format(suffix): upload.duration if upload else 0, "l{}".format(suffix): upload.duration if upload else 0,
"b{}".format(suffix): (track.album.title if track.album else "") or "", "b{}".format(suffix): (track.album.title if track.album else "") or "",
"n{}".format(suffix): track.position or "", "n{}".format(suffix): track.position or "",
"m{}".format(suffix): str(track.mbid) or "", "m{}".format(suffix): str(track.mbid or ""),
"o{}".format(suffix): "P", # Source: P = chosen by user "o{}".format(suffix): "P", # Source: P = chosen by user
} }
if date: if date:
@ -115,7 +115,7 @@ def get_scrobble2_payload(track, date, suffix="[0]"):
if track.position: if track.position:
data["trackNumber"] = track.position data["trackNumber"] = track.position
if track.mbid: if track.mbid:
data["mbid"] = str(track.mbid) data["mbid"] = str(track.mbid or "")
if date: if date:
offset = upload.duration / 2 if upload.duration else 0 offset = upload.duration / 2 if upload.duration else 0
data["timestamp"] = int(int(date.timestamp()) - offset) data["timestamp"] = int(int(date.timestamp()) - offset)

1
changes/changelog.d/1498.bug Normal file
View File

@ -0,0 +1 @@
Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)