X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/a0ba03920454c789c3ed241d13bfe64c115f3d19..e53e2434445e78d18c0bdf3596b1444ddb399bde:/flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index bd39bbe..c1e0944 100755
--- a/flac2mp3
+++ b/flac2mp3
@@ -66,30 +66,18 @@ epg::flac::archive::tags->import(
 
 sub flac2mp3 {
     my %a = @_;
+    my $quoted_flac = quote($a{flac});
 
-    my @quoted_pic_options = ();
-    # (fd, picfn) = tempfile.mkstemp()
-    # os.close(fd)
-    # p = Popen(['metaflac', '--export-picture-to', picfn, unquoted_fn],
-    #           stderr=PIPE)
-    # status = p.wait()
-    # stderr = ''.join(p.stderr)
-    # # Hacky check for flac with no album art
-    # if 'no PICTURE block' in stderr:
-    #     # That's fine, just no picture.
-    #     pass
-    # else:
-    #     if status != 0:
-    #         sys.stderr.write('metaflac exited %d: %s\n' % (status, stderr))
-    #         return
-    #     pic_options = "--ti '%s'" % picfn
+    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',
-             quote($a{flac}),
+             $quoted_flac,
              '|',
              'lame',
              '--id3v2-only',
@@ -106,7 +94,7 @@ sub flac2mp3 {
              quote($a{title}),
              '--ty',
              quote($a{date}),
-             @quoted_pic_options,
+             '$pic_options',
              (map { ('--tv', quote("TPE2=$_")) } @{$a{albumartist}}),
              (map { ('--tv', quote("TPOS=$_")) } @{$a{discnumber}}),
              '-',
@@ -122,6 +110,8 @@ sub flac2mp3 {
                  . '.mp3'
              )
         ));
+    say('unset pic_options');
+    say('rm -f flac2mp3.cover.$$');
 }
 
 sub read_tags_metaflac {