X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/c0973ded46cf1aabd5225501ea02a4f5f8e84a5c..64eb2d5f080a1fa083d3cb23f3fb03a8c1665d05:/flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 2233dd9..b951859 100755
--- a/flac2mp3
+++ b/flac2mp3
@@ -50,14 +50,14 @@ Written by Eric Gillespie <epg@pretzelnet.org>.
 
 """
 
-import re, sys, traceback
+import os, re, sys, tempfile, traceback
 from optparse import OptionParser
 from subprocess import Popen, PIPE
 
 import org.diplodocus.jobs
 from org.diplodocus.util import run_or_die
 
-from flac_archive import flac, taglib
+from flac_archive import flac
 from flac_archive.tags import Tags
 
 ################################################################################
@@ -100,13 +100,23 @@ def flac2mp3(fn, title, artist, album_artist, album, date,
     quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
                                                track, title)).replace('/', '_')
 
-    run_or_die(3, "flac %s -cd %s '%s' | lame --add-id3v2 %s --tt '%s' --ta '%s' --tl '%s' --ty '%s' --tn %d %s - '%s'"
-               % (flac_options, ' '.join(skip_until), fn,
-                  lame_options, title, artist, album, date, track,
-                  album_artist_options, quoted_outfile))
-
-    if pics != None:
-        taglib.add_apic_frame_to_mp3(outfile, pics)
+    picfn = None
+    if pics:
+        (fd, picfn) = tempfile.mkstemp()
+        f = os.fdopen(fd, 'wb')
+        f.write(pics[0][7])
+        f.close()
+    try:
+        run_or_die(3, "flac %s -cd %s '%s' | lame --id3v2-only --id3v2-latin1 --pad-id3v2-size 0 %s --tt '%s' --ta '%s' --tl '%s' --ty '%s' --tn %d --ti '%s' %s - '%s'"
+                   % (flac_options, ' '.join(skip_until), fn,
+                      lame_options, title, artist, album, date, track,
+                      picfn, album_artist_options, quoted_outfile))
+    finally:
+        if picfn:
+            try:
+                os.unlink(picfn)
+            except:
+                pass
 
     return 0