Changeset 41 in flacrip for trunk

Timestamp:

05/08/15 20:00:01 (10 years ago)

Author:

peter

Message:

Use Audio::FLAC::Header to write the tags to the FLAC file instead of making
external calls to metaflac. In addition, rip_to_flac now returns a
DiscFlacFile object.

Location:

trunk

Files:

• cd2flac (modified) (1 diff)
• lib/Ripper.pm (modified) (3 diffs)

trunk/cd2flac

@@ -37 +37 @@
 $CD_DEVICE ||= '/dev/cdrom';
 
+my $tags = $BARCODE ? { BARCODE => $BARCODE } : {};
 my $ripper = Ripper->new({ device => $CD_DEVICE });
-$ripper->rip_to_flac($archive_flac);
-
-if ($BARCODE) {
-    print "Writing barcode\n";
-    system 'metaflac', '--set-tag', "BARCODE=$BARCODE", $archive_flac;
-}
+$ripper->rip_to_flac($archive_flac, $tags);
 
 print "Rip saved as $archive_flac\n";

trunk/lib/Ripper.pm

@@ -4 +4 @@
 
 use Tracks;
+use DiscFlacFile;
 
 use File::Temp qw{tempdir};
@@ -20 +21 @@
 
 sub rip_to_flac {
-    my ($self, $archive_flac) = @_;
+    my ($self, $archive_flac, $tags) = @_;
 
     $self->tracks(Tracks->new);
@@ -50 +51 @@
     # copy to permanent location
     copy($flac_file, $archive_flac);
-    system 'metaflac', '--set-tag', "MUSICBRAINZ_DISCID=$discid", $archive_flac;
+
+    # tag the archive flac
+    $tags ||= {};
+    $tags->{MUSICBRAINZ_DISCID} = $discid;
+    my $flac_disc = DiscFlacFile->new({ file => $archive_flac });
+    $flac_disc->flac->{tags}{$_} = $tags->{$_} foreach keys %{$tags};
+    $flac_disc->flac->write;
+
+    return $flac_disc;
 }