untested attempt to restore embedded cover art

[flac-archive] / flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 2231b1f8d23a58b98267e963a6c6647ba3b6824e..c1e09445d77cf83db9bb0c098928d747305cb901 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -1,6 +1,4 @@
-#! /usr/bin/env perl
-
-# $Id$
+#!/usr/local/bin/perl

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -8,139 +6,162 @@ B<flac2mp3> - transcode FLAC file to MP3 files
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<flac2mp3> I<file>
+B<flac2mp3> [B<--lame-options> I<lame-options>] [B<-q>] [B<-v>] I<file> [...]

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-B<flac2mp3> transcodes the FLAC file I<file> to MP3 files.  I<file> is
-the kind of FLAC file B<fa-flacd> generates.  That is, it contains a
-cue sheet, one TITLE tag per track listed therein, and ARTIST, ALBUM,
-and DATE tags.
+B<flac2mp3> transcodes the FLAC files I<file> to MP3 files.  I<file>
+may be the kind of FLAC file B<fa-flacd> generates.  That is, it
+contains a cue sheet, one TITLE tag per track listed therein, and
+ARTIST, ALBUM, and DATE tags.

 
 

-=cut
+Note that lame is retarded, and parses B<LANG> directly itself!  So, in order
+for it to transcode textual tags, you must specify the encoding in LANG, e.g.
+LANG=en_US.utf-8

 
 

-use strict;
-use warnings;
+=head1 OPTIONS

 
 

-use Pod::Usage;
+=over 4

 
 

-sub tformat {
-    my $min = shift;
-    my $sec = shift;
-    my $hun = shift;
-    return "$min:$sec.$hun";
-}
+=item B<--lame-options> I<lame-options>

 
 

-sub get_decode_args {
-    my $fn = shift;
-    my @l;
+Pass I<lame-options> to B<lame>.  This ends up being passed to the
+shell, so feel free to take advantage of that.  You'll almost
+certainly have to put I<lame-options> in single quotes.

 
 

-    open(F, '-|', 'metaflac', '--export-cuesheet-to=-', $fn);
-    while (<F>) {
-        /INDEX 01 (\d\d):(\d\d):(\d\d)$/ or next;
-        push(@l, [$1, $2, $3]);
-    }
+=item B<-q> [B<--quiet>]

 
 

-    my @args;
-    for my $i (0..$#l) {
-        my $arg = ["--skip=" . tformat(@{$l[$i]})];
-        my $next = $l[$i+1];
-        if (defined($next)) {
-            if ($next->[2] == 0) {
-                if ($next->[1] == 0) {
-                    push(@$arg, '--until=' . tformat($next->[0] - 1, 59, 99));
-                } else {
-                    push(@$arg, '--until=' . tformat($next->[0], $next->[1] - 1,
-                                                    99));
-                }
-            } else {
-                push(@$arg, '--until=' . tformat($next->[0], $next->[1],
-                                                $next->[2] - 1));
-            }
-        }
-        push(@args, $arg);
-    }
+Suppress status information.  This option is passed along to B<flac>
+and B<lame>.

 
 

-    return @args;
-}
+=item B<-v> [B<--verbose>]

 
 

-# Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
-# in the file FN.
-sub get_tags {
-    my $fn = shift;
-    my $tag;
-    my $value;
-    my $artist;
-    my $album;
-    my $date;
-    my @titles;
-
-    open(TAGS, '-|', 'metaflac', '--export-vc-to=-', $fn);
-    while (<TAGS>) {
-        chomp;
-
-        ($tag, $value) = split(/=/, $_, 2);
-
-        if (/^ARTIST=/) {
-            $artist = $value;
-        } elsif (/^ALBUM=/) {
-            $album = $value;
-        } elsif (/^DATE=/) {
-            $date = $value;
-        } elsif (/TITLE=/) {
-            push(@titles, $value);
-        }
-    }
-    close(TAGS) or die("close($fn): $!");
+Print diagnostic information.  This option is passed along to B<flac>
+and B<lame>.

 
 

-    return ($artist, $album, $date, @titles);
-}
+=back
+
+=head1 AUTHORS
+
+Written by Eric Gillespie <epg@pretzelnet.org>.
+
+=cut
+
+package epg::flac::archive::mp3;
+
+use v5.12;
+use warnings;
+
+use File::Temp;
+use FindBin;
+
+require "$FindBin::Bin/tags.pl";
+epg::flac::archive::tags->import(
+    qw[
+        disc_tags
+        read_tags
+        mangle_for_file_name
+        quote
+    ]);

 
 sub flac2mp3 {
 
 sub flac2mp3 {

-    my $fn = shift;
-    my $title = shift;
-    my $artist = shift;
-    my $album = shift;
-    my $date = shift;
-    my $track = shift;
-    my $skip_arg = shift;
-    my $until_arg = shift;
-
-    my $outfile = sprintf("$artist ($album) \%02s $title.mp3", $track);
-    $outfile =~ s/\//_/g;
-    $outfile =~ s/:/_/g;
-    $outfile =~ s/'/_/g;
-    $outfile =~ s/"/_/g;
-
-    # XXX
-    $until_arg ||= '';
-    system("flac -cd $skip_arg $until_arg '$fn' | lame --preset standard --tt '$title' --ta '$artist' --tl '$album' --ty '$date' --tn $track - '$outfile'");
+    my %a = @_;
+    my $quoted_flac = quote($a{flac});
+
+    say('if metaflac --export-picture-to=flac2mp3.cover.$$ ', $quoted_flac, '; then');
+    say('    pic_options="--ti flac2mp3.cover.$$"');
+    say('fi');
+
+    # This is an old TODO; what's wrong with --ty ?
+    # TODO: Look at TDOR, TDRL, TDRC for date.
+    say(join(' ',
+             'flac',
+             '-cd',
+             $quoted_flac,
+             '|',
+             'lame',
+             '--id3v2-only',
+             '--id3v2-latin1',
+             '--pad-id3v2-size', 0,
+             '--preset standard',
+             '--ta',
+             quote($a{artist}),
+             '--tl',
+             quote($a{album}),
+             '--tn',
+             quote($a{track}),
+             '--tt',
+             quote($a{title}),
+             '--ty',
+             quote($a{date}),
+             '$pic_options',
+             (map { ('--tv', quote("TPE2=$_")) } @{$a{albumartist}}),
+             (map { ('--tv', quote("TPOS=$_")) } @{$a{discnumber}}),
+             '-',
+             quote(
+                 mangle_for_file_name(
+                     join(' ',
+                          $a{artist},
+                          $a{album},
+                          (map { sprintf('%02d', $_) } @{$a{discnumber}}),
+                          $a{track},
+                          $a{title},
+                     ))
+                 . '.mp3'
+             )
+        ));
+    say('unset pic_options');
+    say('rm -f flac2mp3.cover.$$');

 }
 
 }
 

-MAIN: {
-    my $fn = shift or pod2usage();
-    my @args = get_decode_args($fn);
-    my ($artist, $album, $date, @titles) = get_tags($fn);
-
-    for my $i (0..$#titles) {
-        flac2mp3($fn, $titles[$i], $artist, $album, $date, $i + 1,
-                 @{$args[$i]});
+sub read_tags_metaflac {
+    my $fn = shift;
+    open(my $fh, '-|', 'metaflac', '--no-utf8-convert', '--export-tags-to=-', $fn) || die("metalfac: $!");
+    my @result = read_tags($fh);
+    if (!close($fh)) {
+        if ($! == 0) {
+            die("metaflac exited $?")
+        }
+        die("close(metaflac): $!")

     }
     }

+    @result

 }
 
 }
 

-\f
-__END__
-
-=head1 AUTHORS
-
-Written by Eric Gillespie <epg@pretzelnet.org>.
+sub main {
+    for my $fn (@_) {
+        my ($tags) = read_tags_metaflac($fn);
+        my ($album, $artist, $date, $discnumber) = disc_tags($tags);
+
+        # TODO resurrect whole-disc FLAC?
+        # Stupid hack: only a single-track file should have the
+        # TRACKNUMBER tag, so use it if set for the first pass through
+        # the loop.  At the end of the loop, we'll set $track for the
+        # next run, so this continues to work for multi-track files.
+                # if track == None:
+                #     track = 1
+                # else:
+                #     track = int(track)
+        {
+            my $tracknumber = epg::flac::archive::tags::one(TRACKNUMBER => $tags);
+            my $title = epg::flac::archive::tags::one(TITLE => $tags);
+            # TODO restore PARTNUMBER and VERSION net time i need them
+            flac2mp3(
+                artist => $artist,
+                album => $album,
+                date => $date,
+                discnumber => $discnumber,
+                track => $tracknumber,
+                title => $title,
+                flac => $fn,
+                )
+        }
+    }

 
 

-=cut
+    return 0;
+}

 
 

-# Local variables:
-# cperl-indent-level: 4
-# perl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
+if (!caller) {
+    exit(main(@ARGV))
+}

 
 

-# vi: set tabstop=4 expandtab:
+1;