Mirrors/musicbrainz-userscripts
2
0
Fork 0
mirror of https://github.com/murdos/musicbrainz-userscripts synced 2024-12-14 20:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

discogs: introduce artistNoNum() function and reduce code redundancy

Browse source
This commit is contained in:
Laurent Monin 2015-06-23 08:35:20 +02:00
parent 1f55960600
commit 92626ce158
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
discogs_importer.user.js
View file

@ -430,6 +430,12 @@ function cleanup_discogs_artist_credit(obj) {
} }
} }
// Returns the name without the numerical suffic Discogs adds as disambiguation
// ie. "ABC (123)" -> "ABC"
function artistNoNum(artist_name) {
return artist_name.replace(/ \(\d+\)$/, "");
}
// Analyze Discogs data and return a release object // Analyze Discogs data and return a release object
function parseDiscogsRelease(data) { function parseDiscogsRelease(data) {
@ -445,8 +451,8 @@ function parseDiscogsRelease(data) {
release.artist_credit = []; release.artist_credit = [];
$.each(discogsRelease.artists, function(index, artist) { $.each(discogsRelease.artists, function(index, artist) {
var ac = { var ac = {
'artist_name': artist.name.replace(/ \(\d+\)$/, ""), 'artist_name': artistNoNum(artist.name),
'credited_name': (artist.anv != "" ? artist.anv : artist.name.replace(/ \(\d+\)$/, "")), 'credited_name': (artist.anv != "" ? artist.anv : artistNoNum(artist.name)),
'joinphrase': decodeDiscogsJoinphrase(artist.join), 'joinphrase': decodeDiscogsJoinphrase(artist.join),
'mbid': MBIDfromUrl(artist.resource_url, 'artist') 'mbid': MBIDfromUrl(artist.resource_url, 'artist')
}; };
@ -593,8 +599,8 @@ function parseDiscogsRelease(data) {
if (discogsTrack.artists) { if (discogsTrack.artists) {
$.each(discogsTrack.artists, function(index, artist) { $.each(discogsTrack.artists, function(index, artist) {
var ac = { var ac = {
'artist_name': artist.name.replace(/ \(\d+\)$/, ""), 'artist_name': artistNoNum(artist.name),
'credited_name': (artist.anv != "" ? artist.anv : artist.name.replace(/ \(\d+\)$/, "")), 'credited_name': (artist.anv != "" ? artist.anv : artistNoNum(artist.name)),
'joinphrase': decodeDiscogsJoinphrase(artist.join), 'joinphrase': decodeDiscogsJoinphrase(artist.join),
'mbid': MBIDfromUrl(artist.resource_url, 'artist') 'mbid': MBIDfromUrl(artist.resource_url, 'artist')
}; };