s/ostream/iostream/; s/diag/file_diag/

[flac-archive] / flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 24e4a48f64b980349bed23cfc0ffdf8b77bbdfbb..b2fc71912168daf17c901b8f7de694ea2b1313c4 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -61,14 +61,13 @@ from subprocess import Popen, PIPE
 import org.diplodocus.jobs
 from org.diplodocus.util import run_or_die
 
-from flac_archive import flac
 from flac_archive.tags import Tags
 
 ################################################################################
 # The child processes
 
 def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
-             track, skip_until, pics=None):
+             track, skip_until):
     (title, artist, album) = [(x == None and 'unknown') or x
                               for x in (title, artist, album)]
     if date == None:
@@ -89,6 +88,8 @@ def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
     verbose and tmp.append('--verbose')
     lame_options = ' '.join(tmp)
 
+    unquoted_fn = fn
+
     # Escape any single quotes ' so we can quote this.
     (fn, title, artist, album_artist,
      album, date) = [(x or '').replace("'", r"'\''")
@@ -111,24 +112,33 @@ def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
         return quoted_outfile.replace(r"'\''", "'")
 
     pic_options = ''
-    if pics:
-        (fd, picfn) = tempfile.mkstemp()
-        f = os.fdopen(fd, 'wb')
-        f.write(pics[0][7])
-        f.close()
+    (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
     try:
+        # TODO: Look at TDOR, TDRL, TDRC for date.
         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 - '%s'"
                    % (flac_options, ' '.join(skip_until), fn,
                       lame_options, title, artist, album, date, track,
                       pic_options, album_artist_options,
                       discnum_options, quoted_outfile))
     finally:
-        if pic_options:
-            try:
-                os.unlink(picfn)
-            except:
-                pass
+        try:
+            os.unlink(picfn)
+        except:
+            pass
 
     return 0
 
@@ -245,8 +255,6 @@ def main(argv):
                 else:
                     track = int(track)
 
-                pics = flac.get_pictures(fn)
-
                 for i in range(len(tags)):
                     title = tags.gets('TITLE', track, separator)
                     part = tags.gets('PART', track)
@@ -263,7 +271,7 @@ def main(argv):
                                  ', '.join(artist),
                                  album_artist, album, discnum,
                                  tags.gets('DATE', track),
-                                 track, args[i], pics)
+                                 track, args[i])
                         if not os.path.exists(mp3):
                             print fn
                             break
@@ -272,7 +280,7 @@ def main(argv):
                                  ', '.join(artist),
                                  album_artist, album, discnum,
                                  tags.gets('DATE', track),
-                                 track, args[i], pics))
+                                 track, args[i]))
                     track = i + 2
             except Exception, error:
                 sys.stderr.write(getattr(error, 'msg', ''))