Changeset 31 in flacrip

Timestamp:

11/26/14 22:50:16 (10 years ago)

Author:

peter

Message:

• mbz uses DiscFlacFile to read the discid from a FLAC file
• remove the TRACKS array from the returned info hash from get_musicbrainz_info()
• Tracks::read_flac() can take an Audio::FLAC::Header as its argument instead of a filename

Location:

trunk

Files:

• lib/MusicBrainz.pm (modified) (1 diff)
• lib/Tracks.pm (modified) (1 diff)
• mbz (modified) (3 diffs)

trunk/lib/MusicBrainz.pm

@@ -108 +108 @@
         @info{"$prefix.ARTIST", "$prefix.ARTISTSORT"} = get_artist_credits($xpath, $recording);
 
-        $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/lib/Tracks.pm

@@ -120 +120 @@
     my ($self, $file) = @_;
 
-    my $flac = Audio::FLAC::Header->new($file);
+    my $flac = ref $file ? $file : Audio::FLAC::Header->new($file);
     my $cuesheet_lines = $flac->cuesheet;
     my $CUE = IO::Lines->new($cuesheet_lines);

trunk/mbz

@@ -9 +9 @@
 use Getopt::Long;
 use MusicBrainz;
+use DiscFlacFile;
 
 GetOptions(
@@ -19 +20 @@
 
 if ($FLAC_FILE) {
-    require Audio::FLAC::Header;
-    my $flac = Audio::FLAC::Header->new($FLAC_FILE) or die "Can't read FLAC header from $FLAC_FILE\n";
-    $discid = $flac->tags('MUSICBRAINZ_DISCID') or die "No MUSICBRAINZ_DISCID tag in $FLAC_FILE\n";
+    $discid = DiscFlacFile->new({ file => $FLAC_FILE })->discid;
 } else {
     $discid = shift;
@@ -44 +43 @@
 } else {
     for my $key (sort keys %{ $info }) {
-        print "$key=$$info{$key}\n" unless ref $info->{$key};
+        print "$key=$$info{$key}\n";
     }
 }