untested attempt to restore embedded cover art

[flac-archive] / flac2mp3

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

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -17,257 +15,153 @@ 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.
 
 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 POSIX ':sys_wait_h';
-use Pod::Usage;
-use Getopt::Long qw(:config gnu_getopt no_ignore_case);
+=over 4

 
 

-my $flac_options;
-my $lame_options;
-my $quiet;
-my $verbose;
+=item B<--lame-options> I<lame-options>

 
 

-sub run_or_die {
-    my $command = shift;
-    my $status;
+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.

 
 

-    $verbose and print(STDERR "$command\n");
-    $status = system($command);
+=item B<-q> [B<--quiet>]

 
 

-    if (WIFEXITED($status)) {
-        if (($status = WEXITSTATUS($status)) != 0) {
-            die("$command exited with status $status");
-        }
-    } elsif (WIFSIGNALED($status)) {
-        die("$command killed with signal ", WTERMSIG($status));
-    } elsif (WIFSTOPPED($status)) {
-        die("$command stopped with signal ", WSTOPSIG($status));
-    } else {
-        die("Major horkage on system($command): \$? = $? \$! = $!");
-    }
-}
+Suppress status information.  This option is passed along to B<flac>
+and B<lame>.

 
 

-sub tformat {
-    return sprintf('%02d:%02d.%02d', @_);
-}
+=item B<-v> [B<--verbose>]

 
 

-sub get_decode_args {
-    my $fn = shift;
-    my @l;
+Print diagnostic information.  This option is passed along to B<flac>
+and B<lame>.

 
 

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

 
 

-    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, 74));
-                } else {
-                    push(@$arg, '--until=' . tformat($next->[0], $next->[1] - 1,
-                                                    74));
-                }
-            } else {
-                push(@$arg, '--until=' . tformat($next->[0], $next->[1],
-                                                $next->[2] - 1));
-            }
-        }
-        push(@args, $arg);
-    }
+=head1 AUTHORS

 
 

-    # If no cue sheet, stick a dummy in here.
-    if (@args == 0) {
-        @args = ([]);
-    }
+Written by Eric Gillespie <epg@pretzelnet.org>.

 
 

-    return @args;
-}
+=cut

 
 

-# Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
-# in the file FN.
-sub get_tags {
-    my $fn = shift;
-    my $artists = shift;
-    my $titles = shift;
-    my $tag;
-    my $value;
-    my $artist;
-    my $album;
-    my $date;
-    my $discnum;
-    my $track;
-
-    open(TAGS, '-|', 'metaflac', '--export-vc-to=-', $fn)
-      or die("open(metaflac --export-vc-to=- $fn): $!");
-    while (<TAGS>) {
-        chomp;
-
-        ($tag, $value) = split(/=/, $_, 2);
-
-        if (/^ARTIST=/i) {
-            $artist = $value;
-        } elsif (/^ALBUM=/i) {
-            $album = $value;
-        } elsif (/^DATE=/i) {
-            $date = $value;
-        } elsif (/^DISCNUMBER=/i) {
-            $discnum = int($value);
-        } elsif (/^ARTIST\[/i) {
-            push(@$artists, $value);
-        } elsif (/^TRACKNUMBER=/i) {
-            $track = $value;
-
-        # Intentionally don't match the = on this one, to support the
-        # TITLE[1] .. TITLE[n] tag style.
-        } elsif (/^TITLE/i) {
-            push(@$titles, $value);
-        }
-    }
-    close(TAGS) or die("close(metaflac --export-vc-to=- $fn): $?");
+package epg::flac::archive::mp3;

 
 

-    return ($artist, $album, $date, $discnum, $track);
-}
+use v5.12;
+use warnings;

 
 

-sub arg {
-    my $arg = shift;
-    my $var = shift;
+use File::Temp;
+use FindBin;

 
 

-    if (defined($$var)) {
-        $$var = "$arg '$$var'";
-    } else {
-        $$var = ''
-    }
-}
+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 = int(shift);
-    my $skip_arg = shift;
-    my $until_arg = shift;
-    my @tmp;
-    my $outfile;
-
-    if ($quiet) {
-        $flac_options = '--silent';
-    } else {
-        $flac_options = '';
-    }
+    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.$$');
+}

 
 

-    if ($lame_options) {
-        push(@tmp, $lame_options);
-    } else {
-        push(@tmp, '--preset standard');
-    }
-    $quiet and push(@tmp, '--quiet');
-    $verbose and push(@tmp, '--verbose');
-    $lame_options = join(' ', @tmp);
-
-    # We'll be putting these in single quotes, so we need to escape
-    # any single quotes in the filename by closing the quote ('),
-    # putting an escaped quote (\'), and then reopening the quote (').
-    for ($fn, $title, $artist, $album, $date) {
-        defined and s/'/'\\''/g;
+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): $!")

     }
     }

-
-    $outfile = sprintf("$artist ($album) \%02s $title.mp3", $track);
-    $outfile =~ s/\//_/g;
-
-    arg('--tt', \$title);
-    arg('--ta', \$artist);
-    arg('--tl', \$album);
-    arg('--ty', \$date);
-    arg('--tn', \$track);
-
-    $skip_arg ||= '';
-    $until_arg ||= '';
-    run_or_die(join(' ', "flac $flac_options -cd $skip_arg $until_arg '$fn'",
-                    " | lame $lame_options $title $artist $album $date $track",
-                    " - '$outfile'"));
+    @result

 }
 
 }
 

-MAIN: {
-    my $help;
-    GetOptions(
-               'lame-options=s', \$lame_options,
-               'quiet|q' => \$quiet,
-               'verbose|v' => \$verbose,
-               'help|h|?' => \$help,
-              ) or pod2usage();
-    $help and pod2usage(-exitstatus=>0, -verbose=>1);
-
-    @ARGV or pod2usage();
-    for my $fn (@ARGV) {
-        my @args = get_decode_args($fn);
-        my (@artists, @titles);
-        my ($artist, $album, $date, $discnum, $track) = get_tags($fn, \@artists,
-                                                                 \@titles);
-
-        # lame doesn't seem to support disc number.
-        defined($discnum) and $album .= " (disc $discnum)";
+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.
         # 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.

-        $track ||= 1;
-
-        for my $i (0..$#titles) {
-            flac2mp3($fn, $titles[$i], ($artists[$i] or $artist), $album, $date,
-                     $track, @{$args[$i]});
-            $track = $i + 2;
+                # 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,
+                )

         }
     }
         }
     }

-}
-
-\f
-__END__
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<--lame-options> I<lame-options>
-
-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.

 
 

-=item B<-q> [B<--quiet>]
-
-Suppress status information.  This option is passed along to B<flac>
-and B<lame>.
-
-=item B<-v> [B<--verbose>]
-
-Print diagnostic information.  This option is passed along to B<flac>
-and B<lame>.
-
-=back
-
-=head1 AUTHORS
-
-Written by Eric Gillespie <epg@pretzelnet.org>.
-
-=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;