Changeset 8 in flacrip

Timestamp:

08/23/13 10:45:51 (11 years ago)

Author:

peter

Message:

• use the VorbisComment style tag names in the info hash returned by MusicBrainz::get_musicbrainz_info()
• use the MusicBrainz name credit join phrase to build the string where there are multiple artists
• include the artist sort names in the returned info, as TRACKnn.ARTISTSORT keys, and ALBUMARTIST
• added an applymeta script that applies the metadata listed in a file to a set of MP3 files
• when loooking up a release, MusicBrainz::get_musicbrainz_info() prints the number of releases and some other debugging info to STDERR

Location:

trunk

Files:

• MusicBrainz.pm (modified) (4 diffs)
• applymeta (added)
• mbz (modified) (1 diff)

trunk/MusicBrainz.pm

@@ -5 +5 @@
 
 our @ISA    = qw{Exporter};
-our @EXPORT = qw{get_musicbrainz_info};
+our @EXPORT = qw{get_musicbrainz_info lookup_release};
 
 #use WebService::MusicBrainz;
@@ -36 +36 @@
     my %info;
 
+    #TODO: deprecate the old MBZ tag name
     $info{MBZ_DISCID} = $discid;
+    $info{MUSICBRAINZ_DISCID} = $discid;
 
     my $xpath = XML::XPath->new();
@@ -44 +46 @@
 
     # get the release; if there is more than one, take the first one
+    my $release_count = $xpath->findvalue('count(//release)');
+    my @releases = $xpath->findnodes('//release');
+    my $base = 'http://musicbrainz.org/release/';
+
+    my $i = 1;
+    #TODO: use this as the basis for an interactive menu to pick the correct release ID
+    warn "$release_count release(s) found matching $discid\n";
+    for my $release (@releases) {
+        warn sprintf "%2d) $base%s %s %s (%s)\n", 
+            $i++,
+            $xpath->findvalue('@id', $release)->value,
+            $xpath->findvalue('.//label-info/label/name', $release)->value,
+            $xpath->findvalue('.//label-info/catalog-number', $release)->value,
+            $xpath->findvalue('barcode', $release)->value;
+    }
+
+    # use the VorbisComment names from here http://musicbrainz.org/doc/MusicBrainz_Picard/Tags/Mapping
+
+    # use the first release by default
     # TODO: configurable release selection criteria
-    my $release_count = $xpath->findvalue('count(//release)');
-    my ($release) = $xpath->findnodes('//release[1]');
-    $info{RELEASE_MBID} = $xpath->findvalue('@id', $release)->value;
-    $info{ALBUM}        = $xpath->findvalue('title', $release)->value;
-    $info{ARTIST}       = $xpath->findvalue('artist-credit/name-credit/artist/name', $release)->value;
-
-    # TODO: get release date
+    my $release = $releases[0];
+
+    $info{MUSICBRAINZ_ALBUMID} = $xpath->findvalue('@id', $release)->value;
+    $info{ALBUM}               = $xpath->findvalue('title', $release)->value;
+    $info{ALBUMARTIST}         = $xpath->findvalue('artist-credit/name-credit/artist/name', $release)->value;
+    $info{ALBUMARTISTSORT}     = $xpath->findvalue('artist-credit/name-credit/artist/sort-name', $release)->value;
+    $info{DATE}                = $xpath->findvalue('date', $release)->value;
+    $info{ORIGINALDATE}        = $xpath->findvalue('release-group/first-release-date', $release)->value;
 
     # select the proper medium (important for multidisc releases)
@@ -60 +82 @@
     for my $track_node ($xpath->findnodes('track-list/track', $medium)) {
         my $prefix = sprintf('TRACK%02d', $tracknum);
-        #$info{"$prefix.MB_TRACKID"} = $xpath->findvalue('@id', $track_node);
-        my $recording_mbid = $info{"$prefix.RECORDING_MBID"} = $xpath->findvalue('recording/@id', $track_node)->value;
+        my $track_mbid = $info{"$prefix.MUSICBRAINZ_TRACKID"} = $xpath->findvalue('@id', $track_node)->value;
+        my $recording_mbid = $info{"$prefix.MUSICBRAINZ_RECORDINGID"} = $xpath->findvalue('recording/@id', $track_node)->value;
+
         $info{"$prefix.TITLE"}          = $xpath->findvalue('recording/title', $track_node)->value;
-        $info{"$prefix.ARTIST"}         = $xpath->findvalue('recording/artist-credit/name-credit/artist/name', $track_node)->value || $info{ARTIST};
+
+        # use the MusicBrainz join phrase to build up the multiple artist credits
+        my ($credit, $sort_credit) = ('', '');
+        for my $credit_node ($xpath->findnodes('recording/artist-credit/name-credit', $track_node)) {
+            $credit .= $xpath->findvalue('concat(artist/name, @joinphrase)', $credit_node)->value;
+            $sort_credit .= $xpath->findvalue('concat(artist/sort-name, @joinphrase)', $credit_node)->value;
+        }
+        $info{"$prefix.ARTIST"}     = $credit;
+        $info{"$prefix.ARTISTSORT"} = $sort_credit;
+
         $info{TRACKS}[$tracknum]{TITLE} = $info{"$prefix.TITLE"};
         $info{TRACKS}[$tracknum]{ARTIST} = $info{"$prefix.ARTIST"};
+        $info{TRACKS}[$tracknum]{ARTISTSORT} = $info{"$prefix.ARTISTSORT"};
         #my $uri = URI->new("http://musicbrainz.org/ws/2/recording/$recording_mbid");
         #$uri->query_form(inc => 'artists');

trunk/mbz

@@ -38 +38 @@
 
 if ($GET_RELEASE_ID) {
-    print "$$info{RELEASE_MBID}\n";
+    print "$$info{MUSICBRAINZ_ALBUMID}\n";
 } else {
     for my $key (sort keys %{ $info }) {