Changeset 26 in flacrip for trunk

Timestamp:

10/31/14 21:22:35 (10 years ago)

Author:

peter

Message:

• added parse_cuesheet() function to Tracks
• Tracks can now read tracks in from the CUESHEET block of a FLAC file (read_flac) or from a cue file directly (read_cue)
• Tracks can caluclate the MusicBrainz TOC lookup string (get_musicbrainz_tocdata)
• renamed the get_mbz_discid method to get_musicbrainz_discid
• moved the get_cdparanoia_span method into the Ripper class and made it private

Location:

trunk/lib

Files:

• Ripper.pm (modified) (3 diffs)
• Tracks.pm (modified) (5 diffs)

trunk/lib/Ripper.pm

@@ -30 +30 @@
 
     # rip
-    my $span = $self->tracks->get_cdparanoia_span;
+    my $span = $self->_get_cdparanoia_span;
     system 'cdparanoia', '-d', $self->device, $span, $wav_file;
     die "\nRipping canceled\n" if ($? & 127);
@@ -42 +42 @@
 
     # MusicBrainz discid metadata
-    my $discid = $self->tracks->get_mbz_discid;
+    my $discid = $self->tracks->get_musicbrainz_discid;
 
     # copy to permanent location
@@ -49 +49 @@
 }
 
+sub _get_cdparanoia_span {
+    my ($self) = @_;
+    # use a msf start unless track 1 begins at sector
+    return $self->tracks->tracks->[1]{sector} == 0 ? '1-' : '00:00.00-';
+}
+
 # module return
 1;

trunk/lib/Tracks.pm

@@ -2 +2 @@
 
 use Moose;
+use Audio::FLAC::Header;
+use IO::Lines;
+use IO::File;
 use Digest::SHA1;
 
+# conversion factors
+use constant FRAMES_PER_SECOND => 75;
+use constant SECONDS_PER_MINUTE => 60;
+
+# see also http://flac.sourceforge.net/format.html#cuesheet_track
+# 588 samples/frame = 44100 samples/sec / 75 frames/sec
+use constant SAMPLES_PER_FRAME => 588;
+
+# XXX: does this every vary?
+# or is the lead-in always 88200 samples (88200 / 588 = 150) i.e. 2 seconds?
 use constant SECTOR_OFFSET => 150;
 
@@ -68 +81 @@
 }
 
+sub parse_cuesheet {
+    my ($handle) = @_;
+
+    my @tracks;
+    my $track;
+    while (<$handle>) {
+        if (/TRACK (\d\d)/) {
+            $track = int($1);
+        } elsif (/INDEX 01/) {
+            my ($m,$s,$f) = /INDEX 01 (\d\d):(\d\d):(\d\d)/;
+            my $sector = ($m * SECONDS_PER_MINUTE * FRAMES_PER_SECOND) + ($s * FRAMES_PER_SECOND) + $f;
+            $tracks[$track] = {
+                number => $track,
+                sector => $sector,
+                msf    => "$m:$s:$f",
+            };
+        } elsif (/lead-out/) {
+            my ($total_samples) = /lead-out \d+ (\d+)/;
+            $tracks[0] = {
+                number => 170,
+                sector => $total_samples / SAMPLES_PER_FRAME,
+            };
+        }
+    }
+    return @tracks;
+}
+
+sub read_flac {
+    my ($self, $file) = @_;
+
+    my $flac = Audio::FLAC::Header->new($file);
+    my $cuesheet_lines = $flac->cuesheet;
+    my $CUE = IO::Lines->new($cuesheet_lines);
+
+    $self->tracks([ parse_cuesheet($CUE) ]);
+}
+
+sub read_cue {
+    my ($self, $file) = @_;
+
+    my $CUE = $file eq '-' ? \*STDIN : IO::File->new($file, '<');
+    $self->tracks([ parse_cuesheet($CUE) ]);
+}
+
 sub has_tracks {
     my $self = shift;
@@ -73 +130 @@
 }
 
-sub get_mbz_discid {
+# https://musicbrainz.org/doc/Disc_ID_Calculation
+sub get_musicbrainz_discid {
     my ($self) = @_;
 
@@ -96 +154 @@
 }
 
+sub get_musicbrainz_tocdata {
+    my ($self) = @_;
+    my @tracks = @{ $self->tracks };
+    # this is a CD TOC suitable for submitting to MusicBrainz as a CD Stub
+    # http://musicbrainz.org/doc/XML_Web_Service#Submitting_a_CDStub
+    return (
+        # first track number
+        $tracks[1]{number},
+        # last track number
+        $tracks[-1]{number},
+        # last frame (sector?)
+        $tracks[0]{sector} + SECTOR_OFFSET,
+        # start frame for each track
+        map { $_->{sector} + SECTOR_OFFSET } @tracks[1 .. @tracks - 1],
+    );
+}
 
 sub get_cuesheet {
@@ -113 +187 @@
 }
 
-sub get_cdparanoia_span {
-    my ($self) = @_;
-    # use a msf start unless track 1 begins at sector
-    return $self->tracks->[1]{sector} == 0 ? '1-' : '00:00.00-';
-}
-
 # module return
 1;