Changeset 12 in flacrip for trunk/lib

Timestamp:

05/15/14 20:37:05 (11 years ago)

Author:

peter

Message:

• flactrack aborts if its call to get_musicbrainz_info() returns undef
• added a select_release() function to MusicBrainz.pm that has the user interactively select the release; causes get_musicbrainz_info() to return undef if the user decides to cancel
• removed a bunch of old, commented out code from MusicBrainz.pm

File:

• trunk/lib/MusicBrainz.pm (modified) (3 diffs)

trunk/lib/MusicBrainz.pm

@@ -32 +32 @@
 }
 
+sub select_release {
+    my ($xpath, $discid) = @_;
+
+    # 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;
+    # present the user with an interactive menu to pick/confirm 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;
+    }
+
+    my $selection = 0;
+
+    while ($selection < 1 || $selection > $release_count) {
+        print STDERR "Select a release (1-$release_count): ";
+        $selection = <STDIN>;
+        chomp $selection;
+        return if $selection =~ /^q/i;
+    }
+
+    return $releases[$selection - 1];
+}
+
 sub get_musicbrainz_info {
     my ($discid) = @_;
@@ -45 +77 @@
     $xpath->set_xml($xml);
 
-    # 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 = $releases[0];
+    #my $release = $releases[0];
+    my $release = select_release($xpath, $discid);
+    return unless $release;
 
     $info{MUSICBRAINZ_ALBUMID} = $xpath->findvalue('@id', $release)->value;
@@ -125 +140 @@
 # module return
 1;
-
-=begin MBZ API version 1
-
-sub lookup_release {
-    my ($discid) = @_;
-    my $ua = LWP::UserAgent->new;
-
-    my $uri = URI->new('http://musicbrainz.org/ws/1/release/');
-    $uri->query_form(type => 'xml', discid => $discid);
-
-    my $res = $ua->get($uri);
-    return $res->decoded_content;
-}
-
-sub get_musicbrainz_info {
-    my ($discid) = @_;
-    my %info;
-
-    $info{MBZ_DISCID} = $discid;
-
-    my $xpath = XML::XPath->new();
-
-    $xpath->set_xml(lookup_release($discid));
-
-    # TODO: check for more than 1 release?
-
-    $info{MB_RELEASE_ID} = $xpath->findvalue('//release/@id');
-    $info{ALBUM}         = $xpath->findvalue('//release/title');
-    $info{ARTIST}        = $xpath->findvalue('//release/artist/name');
-    $info{TRACKS}        = [];
-
-    # TODO: get release date
-
-    my $tracknum = 1;
-    for my $track_node ($xpath->findnodes('//track-list/track')) {
-        $info{TRACKS}[$tracknum]{MB_TRACKID} = $xpath->findvalue('@id', $track_node);
-        $info{TRACKS}[$tracknum]{TITLE}      = $xpath->findvalue('title', $track_node);
-        $info{TRACKS}[$tracknum]{ARTIST}     = $xpath->findvalue('artist/name', $track_node) || $info{ARTIST};
-        $tracknum++;
-    }
-
-    return %info;
-}
-
-=cut
-
-=begin WebService::MusicBrainz code
-
-    my $ws_artists = WebService::MusicBrainz->new_artist;
-    my $ws_releases = WebService::MusicBrainz->new_release;
-    my $ws_tracks = WebService::MusicBrainz->new_track;
-
-    # search on the discid
-    my $response = $ws_releases->search({ DISCID => $discid });
-
-    # save this object, since WS::MBZ deletes it when you fetch it
-    # TODO: bug report to WS::MBZ?
-    my $release = $response->release;
-
-    # return undef if there is no matching release for this DiscID
-    return unless defined $release;
-
-    # search again, using the MBID of the first release found
-    # TODO: deal with multiple releases found?
-    # include tracks and artist info
-    $response = $ws_releases->search({
-        MBID => $release->id, 
-        INC => 'discs tracks artist release-events counts',
-    });
-
-    # get the fully filled out Release object (that represents the disc)
-    $release = $response->release;
-
-    if (defined $release->artist) {
-        $info{ARTIST} = $release->artist->name;
-    }
-    if (defined $release->title) {
-        $info{ALBUM} = $release->title;
-    }
-
-    # this is ID3v2:TDRL = Release Date
-    # (for now we just take the first date)
-    my $release_date = eval { @{ $release->release_event_list->events }[0]->date };
-    $release_date = '' if $@;
-
-    $info{DATE} = $release_date;
-
-    # get full info on each of the tracks
-    my @tracks;
-    my $track_num = 1;
-    for my $track_id (map { $_->id } @{ $release->track_list->tracks }) {
-        my $response = $ws_tracks->search({ 
-            MBID => $track_id,
-            INC => 'artist track-rels',
-        });
-        my $track = $response->track;
-        my $prefix = sprintf('TRACK%02d', $track_num);
-        $info{"$prefix.TITLE"} = $track->title;
-        #if (defined $track->artist && $track->artist->name ne $release->artist->name) {
-            $info{"$prefix.ARTIST"} = $track->artist->name;
-            $info{"$prefix.DATE"} = $release_date;
-        #}
-        push @tracks, $track;
-
-
-        if (defined $track->relation_list) {
-            for my $relation (@{ $track->relation_list->relations }) {
-                #warn $relation->type, $relation->target;
-                my $response = $ws_tracks->search({
-                    MBID => $relation->target,
-                    INC => 'artist releases',
-                });
-                my $track = $response->track;
-                $info{"$prefix.ORIGINAL_ARTIST"} = $track->artist->name;
-                $info{"$prefix.ORIGINAL_ALBUM"} = 
-                    ( (@{ $track->release_list->releases })[0]->title );
-            }
-        }
-
-        $track_num++;
-    }
-
-=cut