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

diff --git a/flac2mp3 b/flac2mp3
index 2233dd9..000d8ef 100755
--- a/flac2mp3
+++ b/flac2mp3
@@ -16,6 +16,10 @@ 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.
 
+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
+
 =head1 OPTIONS
 
 =over 4
@@ -50,14 +54,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 +104,24 @@ 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)
+    pic_options = None
+    if pics:
+        (fd, picfn) = tempfile.mkstemp()
+        f = os.fdopen(fd, 'wb')
+        f.write(pics[0][7])
+        f.close()
+        pic_options = "--ti '%s'" % picfn
+    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 %s %s - '%s'"
+                   % (flac_options, ' '.join(skip_until), fn,
+                      lame_options, title, artist, album, date, track,
+                      pic_options, album_artist_options, quoted_outfile))
+    finally:
+        if pic_options:
+            try:
+                os.unlink(picfn)
+            except:
+                pass
 
     return 0
 
@@ -228,6 +243,9 @@ def main(argv):
                     part = tags.gets('PART', track)
                     if part != None:
                         title = '%s - %s' % (title, part)
+                    version = tags.gets('VERSION', track)
+                    if version != None:
+                        title = '%s (%s)' % (title, version)
                     artist = tags.get('ARTIST', track)
                     artist.extend(tags.get('FEATURING', track))
                     album_artist = tags.gets('ALBUMARTIST', track)