X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/4cdaaa303b93816e3132e42be1879d33ab9f1139..2ad4f7ba7b34e3bbbdf4f1e1de18810d92cebd4b:/flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index d9f9f7b..b2fc719 100755
--- 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"'\''")
@@ -106,26 +107,38 @@ def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
 
     quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, outfile_album,
                                                track, title)).replace('/', '_')
-
-    pic_options = None
-    if pics:
-        (fd, picfn) = tempfile.mkstemp()
-        f = os.fdopen(fd, 'wb')
-        f.write(pics[0][7])
-        f.close()
+    # HACK! :(
+    if check_missing:
+        return quoted_outfile.replace(r"'\''", "'")
+
+    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
     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
 
@@ -198,6 +211,8 @@ def main(argv):
         parser.add_option('--lame-options')
         parser.add_option('-q', '--quiet', action='store_true', default=False)
         parser.add_option('-v', '--verbose', action='store_true', default=False)
+        parser.add_option('--check-missing-files', action='store_true',
+                          default=False)
     except:
         traceback.print_exc()
         return 2
@@ -214,6 +229,8 @@ def main(argv):
     separator = ' '
     try:
         global debug, flac_options, lame_options, quiet, verbose
+        global check_missing
+        check_missing = options.check_missing_files
         debug = options.debug
         lame_options = options.lame_options
         quiet = options.quiet
@@ -238,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)
@@ -251,11 +266,21 @@ def main(argv):
                     artist = tags.get('ARTIST', track)
                     artist.extend(tags.get('FEATURING', track))
                     album_artist = tags.gets('ALBUMARTIST', track)
+                    if check_missing:
+                        mp3 = flac2mp3(fn, title,
+                                 ', '.join(artist),
+                                 album_artist, album, discnum,
+                                 tags.gets('DATE', track),
+                                 track, args[i])
+                        if not os.path.exists(mp3):
+                            print fn
+                            break
+                        continue
                     jobs.append((fn, title,
                                  ', '.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', ''))