Skip to content

discogs_importer: subtracks in Discogs to separete tracks in Musicbrainz #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hirokobayashi wants to merge 14 commits into
base: master
Choose a base branch
from
Open

discogs_importer: subtracks in Discogs to separete tracks in Musicbrainz #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a211ace
discogs_importer: Change subtracks in Discogs to separete tracks in M…
hirokobayashi Jun 18, 2020
27ebcc8
Fix linter error
hirokobayashi Jun 19, 2020
26baf96
Fix linter error
hirokobayashi Jun 19, 2020
5207903
Fix linter error
hirokobayashi Jun 19, 2020
291b654
Fix conflict and update script
hirokobayashi May 23, 2026
b8178e3
Fix typo
hirokobayashi May 24, 2026
ef56358
Merge branch 'murdos:master' into master
hirokobayashi Jun 2, 2026
5aed70a
export parseDscogsRelease for tests
hirokobayashi Jun 5, 2026
f2fb9bc
Merge branch 'murdos:master' into master
hirokobayashi Jun 23, 2026
adebf9e
chore(discogs_importer): fix lint issues
arsinclair Jul 20, 2026
9a17123
chore(discogs_importer): remove unnecessary export
arsinclair Jul 20, 2026
4690288
Merge branch 'master' into hiro-branch
arsinclair Jul 20, 2026
1539103
chore: update snapshots with the changes
arsinclair Jul 20, 2026
ece772d
discogs_importer: avoid splitting physical subtracks
hirokobayashi Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion discogs_importer.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@ function parseDiscogsRelease(discogsRelease) {
let releaseNumber = 1;
let lastPosition = 0;
$.each(discogsRelease.tracklist, function (index, discogsTrack) {
let tracks = [];
if (discogsTrack.type_ === 'heading') {
heading = discogsTrack.title;
return;
Expand Down Expand Up @@ -881,14 +882,33 @@ function parseDiscogsRelease(discogsRelease) {
if (subtrack.type_ !== 'track') {
return;
}
const position = subtrack.position || '';
const isSubPosition = /^(.*\d)(?:\.(?:\d+|[a-z])|[a-z])$/i.test(position);

if (isSubPosition) {
if (subtrack.duration) {
subtrack_total_duration += MBImport.hmsToMilliSeconds(subtrack.duration);
}
if (subtrack.title) {
subtrack_titles.push(subtrack.title);
} else {
subtrack_titles.push('[unknown]');
}
return;
}
let track_new = new Object();
if (subtrack.duration) {
track_new.duration = MBImport.hmsToMilliSeconds(subtrack.duration);
subtrack_total_duration += MBImport.hmsToMilliSeconds(subtrack.duration);
}
if (subtrack.title) {
track_new.title = `${track.title}: ${subtrack.title}`;
track_new.artist_credit = track.artist_credit;
subtrack_titles.push(subtrack.title);
} else {
subtrack_titles.push('[unknown]');
}
tracks.push(track_new);
});
if (subtrack_titles.length) {
if (track.title) {
Expand Down Expand Up @@ -977,7 +997,13 @@ function parseDiscogsRelease(discogsRelease) {

// Trackposition is empty e.g. for release title
if (trackPosition !== '' && trackPosition != null) {
release.discs[discindex].tracks.push(track);
if (tracks.length > 0) {
for (var i = 0; i < tracks.length; i++) {
release.discs[discindex].tracks.push(tracks[i]);
}
} else {
release.discs[discindex].tracks.push(track);
}
}

if (buggyTrackNumber && !release.maybe_buggy) {
Expand Down
34 changes: 30 additions & 4 deletions tests/discogs/snapshots/1156598.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,36 @@
"number": "A4"
},
{
"title": "Lizard: Prince Rupert Awakes / Bolero - The Peacock's Tale / The Battle Of Glass Tears (Including:) / Dawn Song / Last Skirmish / Prince Rupert's Lament / Big Top",
"duration": 1344000,
"artist_credit": [],
"number": ""
"duration": 274000,
"title": "Lizard: Prince Rupert Awakes",
"artist_credit": []
},
{
"duration": 390000,
"title": "Lizard: Bolero - The Peacock's Tale",
"artist_credit": []
},
{
"duration": 655000,
"title": "Lizard: The Battle Of Glass Tears (Including:)",
"artist_credit": []
},
{
"title": "Lizard: Dawn Song",
"artist_credit": []
},
{
"title": "Lizard: Last Skirmish",
"artist_credit": []
},
{
"title": "Lizard: Prince Rupert's Lament",
"artist_credit": []
},
{
"duration": 65000,
"title": "Lizard: Big Top",
"artist_credit": []
}
],
"format": "12\" Vinyl"
Expand Down
190 changes: 170 additions & 20 deletions tests/discogs/snapshots/15313328.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,23 @@
{
"tracks": [
{
"title": "Symphony No 3 In E Flat Major, Op 55 'Eroica' (1803): Allegro Con Brio / Marcia Funebre: Adagio Assi / Scherzo And Trio: Allegro Vivace / Finale: Allegro Molto",
"duration": 2953000,
"duration": 1070000,
"title": "Symphony No 3 In E Flat Major, Op 55 'Eroica' (1803): Allegro Con Brio",
"artist_credit": []
},
{
"duration": 862000,
"title": "Symphony No 3 In E Flat Major, Op 55 'Eroica' (1803): Marcia Funebre: Adagio Assi",
"artist_credit": []
},
{
"duration": 354000,
"title": "Symphony No 3 In E Flat Major, Op 55 'Eroica' (1803): Scherzo And Trio: Allegro Vivace",
"artist_credit": []
},
{
"duration": 667000,
"title": "Symphony No 3 In E Flat Major, Op 55 'Eroica' (1803): Finale: Allegro Molto",
"artist_credit": []
},
{
Expand All @@ -18,13 +33,43 @@
{
"tracks": [
{
"title": "Symphony No 4 In B Flat Major, Op 60 (1806): Adagio - Allegro Vivace / Adagio / Allegro Vivace / Allegro Ma Non Troppo",
"duration": 1970000,
"duration": 679000,
"title": "Symphony No 4 In B Flat Major, Op 60 (1806): Adagio - Allegro Vivace",
"artist_credit": []
},
{
"duration": 546000,
"title": "Symphony No 4 In B Flat Major, Op 60 (1806): Adagio",
"artist_credit": []
},
{
"title": "Symphony No 8 In F Major, Op 93 (1812): Allegro Vivace E Con Brio / Allegretto Scherzando / Tempo Di Menuetto / Allegro Vivace",
"duration": 1491000,
"duration": 338000,
"title": "Symphony No 4 In B Flat Major, Op 60 (1806): Allegro Vivace",
"artist_credit": []
},
{
"duration": 407000,
"title": "Symphony No 4 In B Flat Major, Op 60 (1806): Allegro Ma Non Troppo",
"artist_credit": []
},
{
"duration": 548000,
"title": "Symphony No 8 In F Major, Op 93 (1812): Allegro Vivace E Con Brio",
"artist_credit": []
},
{
"duration": 234000,
"title": "Symphony No 8 In F Major, Op 93 (1812): Allegretto Scherzando",
"artist_credit": []
},
{
"duration": 264000,
"title": "Symphony No 8 In F Major, Op 93 (1812): Tempo Di Menuetto",
"artist_credit": []
},
{
"duration": 445000,
"title": "Symphony No 8 In F Major, Op 93 (1812): Allegro Vivace",
"artist_credit": []
}
],
Expand All @@ -33,13 +78,43 @@
{
"tracks": [
{
"title": "Symphony No 5 In C Minor, Op 67 (1807-08): Allegro Con Brio / Andante Con Moto / Allegro / Allegro",
"duration": 1883000,
"duration": 455000,
"title": "Symphony No 5 In C Minor, Op 67 (1807-08): Allegro Con Brio",
"artist_credit": []
},
{
"duration": 516000,
"title": "Symphony No 5 In C Minor, Op 67 (1807-08): Andante Con Moto",
"artist_credit": []
},
{
"duration": 294000,
"title": "Symphony No 5 In C Minor, Op 67 (1807-08): Allegro",
"artist_credit": []
},
{
"duration": 618000,
"title": "Symphony No 5 In C Minor, Op 67 (1807-08): Allegro",
"artist_credit": []
},
{
"duration": 580000,
"title": "Symphony No 1 In C Major, Op 21 (1799-1800): Adagio Molto - Allegro Con Brio",
"artist_credit": []
},
{
"duration": 412000,
"title": "Symphony No 1 In C Major, Op 21 (1799-1800): Andante Cantabile Con Moto",
"artist_credit": []
},
{
"duration": 199000,
"title": "Symphony No 1 In C Major, Op 21 (1799-1800): Menuetto & Trio: Allegro Molto E Vivace",
"artist_credit": []
},
{
"title": "Symphony No 1 In C Major, Op 21 (1799-1800): Adagio Molto - Allegro Con Brio / Andante Cantabile Con Moto / Menuetto & Trio: Allegro Molto E Vivace / Adagio - Allegro Molto E Vivace",
"duration": 1537000,
"duration": 346000,
"title": "Symphony No 1 In C Major, Op 21 (1799-1800): Adagio - Allegro Molto E Vivace",
"artist_credit": []
}
],
Expand All @@ -48,13 +123,48 @@
{
"tracks": [
{
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Erwachen Heiterer Gefühle Bei Der Ankunft Auf Dem Lande (Allegro Ma Non Troppo) / Szene Am Bach (Andante Molto Mosso) / Lustiges Zusammensein Der Landleute (Allegro) / Gewitter, Sturm (Allegro) / Hirtengesang - Frohe, Dankbare Gefühle Nach Dem Sturm (Allegretto)",
"duration": 2495000,
"duration": 699000,
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Erwachen Heiterer Gefühle Bei Der Ankunft Auf Dem Lande (Allegro Ma Non Troppo)",
"artist_credit": []
},
{
"title": "Symphony No 2 In D Major, Op 36 (1799-1802): Adagio Molto - Allegro Con Brio / Larghetto / Scherzo & Trio: Allegro / Allegro Molto",
"duration": 2068000,
"duration": 708000,
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Szene Am Bach (Andante Molto Mosso)",
"artist_credit": []
},
{
"duration": 299000,
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Lustiges Zusammensein Der Landleute (Allegro)",
"artist_credit": []
},
{
"duration": 212000,
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Gewitter, Sturm (Allegro)",
"artist_credit": []
},
{
"duration": 577000,
"title": "Symphony No 6 In F Major, Op 68 'Pastoral' (1807-08): Hirtengesang - Frohe, Dankbare Gefühle Nach Dem Sturm (Allegretto)",
"artist_credit": []
},
{
"duration": 786000,
"title": "Symphony No 2 In D Major, Op 36 (1799-1802): Adagio Molto - Allegro Con Brio",
"artist_credit": []
},
{
"duration": 643000,
"title": "Symphony No 2 In D Major, Op 36 (1799-1802): Larghetto",
"artist_credit": []
},
{
"duration": 240000,
"title": "Symphony No 2 In D Major, Op 36 (1799-1802): Scherzo & Trio: Allegro",
"artist_credit": []
},
{
"duration": 399000,
"title": "Symphony No 2 In D Major, Op 36 (1799-1802): Allegro Molto",
"artist_credit": []
}
],
Expand All @@ -63,13 +173,38 @@
{
"tracks": [
{
"title": "Symphony No 7 In A Major, Op 92 (1811-12): Poco Sostenuto - Vivace / Allegretto / Presto / Allegro Con Brio",
"duration": 2321000,
"duration": 805000,
"title": "Symphony No 7 In A Major, Op 92 (1811-12): Poco Sostenuto - Vivace",
"artist_credit": []
},
{
"title": "Triple Concerto In C Major For Piano, Violin And Cello Op 56 (1803-1804): Allegro / Largo / Rondo Alla Polacca",
"duration": 2154000,
"duration": 461000,
"title": "Symphony No 7 In A Major, Op 92 (1811-12): Allegretto",
"artist_credit": []
},
{
"duration": 545000,
"title": "Symphony No 7 In A Major, Op 92 (1811-12): Presto",
"artist_credit": []
},
{
"duration": 510000,
"title": "Symphony No 7 In A Major, Op 92 (1811-12): Allegro Con Brio",
"artist_credit": []
},
{
"duration": 1060000,
"title": "Triple Concerto In C Major For Piano, Violin And Cello Op 56 (1803-1804): Allegro",
"artist_credit": []
},
{
"duration": 301000,
"title": "Triple Concerto In C Major For Piano, Violin And Cello Op 56 (1803-1804): Largo",
"artist_credit": []
},
{
"duration": 793000,
"title": "Triple Concerto In C Major For Piano, Violin And Cello Op 56 (1803-1804): Rondo Alla Polacca",
"artist_credit": []
}
],
Expand All @@ -78,8 +213,23 @@
{
"tracks": [
{
"title": "Symphony No 9 In D Minor, Op 125 'Choral' (1823-24): Allegro Ma Non Troppo, Un Poco Maestoso / Scherzo: Molto Vivace / Adagio Molto E Cantabile / Presto - Allegro Ma Non Troppo - Vivace - Adagio Cantabile",
"duration": 4091000,
"duration": 936000,
"title": "Symphony No 9 In D Minor, Op 125 'Choral' (1823-24): Allegro Ma Non Troppo, Un Poco Maestoso",
"artist_credit": []
},
{
"duration": 830000,
"title": "Symphony No 9 In D Minor, Op 125 'Choral' (1823-24): Scherzo: Molto Vivace",
"artist_credit": []
},
{
"duration": 852000,
"title": "Symphony No 9 In D Minor, Op 125 'Choral' (1823-24): Adagio Molto E Cantabile",
"artist_credit": []
},
{
"duration": 1473000,
"title": "Symphony No 9 In D Minor, Op 125 'Choral' (1823-24): Presto - Allegro Ma Non Troppo - Vivace - Adagio Cantabile",
"artist_credit": []
}
],
Expand Down
19 changes: 17 additions & 2 deletions tests/discogs/snapshots/1996829.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,23 @@
"artist_credit": []
},
{
"title": "Eine Kleine Nachtmusik, K.525: I. Allegro / II. Romance: Andante / III. Menuetto: Allegretto / IV. Rondo: Allegro",
"duration": 1056000,
"duration": 338000,
"title": "Eine Kleine Nachtmusik, K.525: I. Allegro",
"artist_credit": []
},
{
"duration": 362000,
"title": "Eine Kleine Nachtmusik, K.525: II. Romance: Andante",
"artist_credit": []
},
{
"duration": 124000,
"title": "Eine Kleine Nachtmusik, K.525: III. Menuetto: Allegretto",
"artist_credit": []
},
{
"duration": 232000,
"title": "Eine Kleine Nachtmusik, K.525: IV. Rondo: Allegro",
"artist_credit": []
}
],
Expand Down
Loading