Changeset 4 in flacrip for trunk

Timestamp:

07/26/12 21:33:59 (12 years ago)

Author:

peter

Message:

• the MusicBrainz XML parsing returns the actual strings instead of XML::XPath::Literal elements
• flactrack takes an --all parameter that transcodes all of the tracks for a particular flac file into a directory (directory name defaults to the same as the flac filename, but without the ".flac" extension)

Location:

trunk

Files:

• MusicBrainz.pm (modified) (2 diffs)
• flactrack (modified) (4 diffs)

trunk/MusicBrainz.pm

@@ -47 +47 @@
     my $release_count = $xpath->findvalue('count(//release)');
     my ($release) = $xpath->findnodes('//release[1]');
-    $info{RELEASE_MBID} = $xpath->findvalue('@id', $release);
-    $info{ALBUM}        = $xpath->findvalue('title', $release);
-    $info{ARTIST}       = $xpath->findvalue('artist-credit/name-credit/artist/name', $release);
+    $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
@@ -58 +58 @@
         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);
-        $info{"$prefix.TITLE"}          = $xpath->findvalue('recording/title', $track_node);
-        $info{"$prefix.ARTIST"}         = $xpath->findvalue('recording/artist-credit/name-credit/artist/name', $track_node) || $info{ARTIST};
+        my $recording_mbid = $info{"$prefix.RECORDING_MBID"} = $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};
         $info{TRACKS}[$tracknum]{TITLE} = $info{"$prefix.TITLE"};
         $info{TRACKS}[$tracknum]{ARTIST} = $info{"$prefix.ARTIST"};

trunk/flactrack

@@ -7 +7 @@
 # TODO: separate sox filter for each track!
 
-use Getopt::Long;
+use Getopt::Long qw{:config no_ignore_case};
+use File::Spec::Functions qw{catfile};
+use File::Path;
+use Audio::FLAC::Header;
 use MusicBrainz;
 
@@ -14 +17 @@
     't=s' => \my $TYPE,
     'x=s' => \my $SOX_FILTER,
+    'all|a' => \my $ALL,
+    'dir|d=s' => \my $DIRECTORY,
 );
 
@@ -21 +26 @@
 $TYPE ||= 'mp3';
 
+# default the directory to be named like the flac file
+($DIRECTORY ||= $FLAC_FILE) =~ s/\.flac$//;
+
+my $flac = Audio::FLAC::Header->new($FLAC_FILE) or die "Can't read FLAC header from $FLAC_FILE\n";
+
 # for getting track metadata from MusicBrainz
 my $info;
-if ($TYPE eq 'mp3') {
-    require Audio::FLAC::Header;
-    require LWP;
-    require XML::XPath;
-    require XML::XPath::XMLParser;
-
-    my $flac = Audio::FLAC::Header->new($FLAC_FILE) or warn "Can't read FLAC header from $FLAC_FILE\n";
+if ($ALL || $TYPE eq 'mp3') {
     my $discid = $flac->tags('MBZ_DISCID') or warn "No MBZ_DISCID tag in $FLAC_FILE\n" if $flac;
     #TODO: calculate TOC and DISCID from cuesheet if there is no MBZ_DISCID tag present
 
+    #TODO: also get the year from MBZ
     $info = get_musicbrainz_info($discid);
+}
+
+if ($ALL) {
+    die "Use of --all requires a --directory\n" unless $DIRECTORY;
+    use YAML;
+    my $cuesheet = $flac->cuesheet;
+    my $count = scalar grep { /TRACK \d\d/ } @{ $flac->cuesheet };
+    print "Found $count tracks\n";
+    #TODO: default to just 01, 02, etc. if there is no $info
+    %TRACKS = map {
+        $_ => catfile($DIRECTORY, sprintf('%02d.%s', $_, to_filename($info->{TRACKS}[$_]{TITLE})))
+    } (1 .. $count);
+    print Dump(\%TRACKS);
+    mkpath($DIRECTORY);
 }
 
@@ -79 +98 @@
     return qq{"$string"};
 }
+
+sub to_filename {
+    my @strings = @_;
+    #TODO: deal with non-ascii characters (unidecode) e.g. ü --> ue
+    return map {
+        s/[^a-z0-9-_ ]+//gi;
+        s/ +/_/g;
+        lc;
+    } @strings;
+}