remove my old crappy flac module, unused for a while

[flac-archive] / flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 1e29ad0bc04f727d947667bf6dc8107d747cc02e..b2fc71912168daf17c901b8f7de694ea2b1313c4 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.4
+#!/usr/bin/python

 
 """
 =head1 NAME
 
 """
 =head1 NAME


@@ -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.
 
 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
 =head1 OPTIONS
 
 =over 4


@@ -50,18 +54,20 @@ 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 optparse import OptionParser
 from subprocess import Popen, PIPE
 
 import org.diplodocus.jobs

-from org.diplodocus import flac, taglib

 from org.diplodocus.util import run_or_die
 
 from org.diplodocus.util import run_or_die
 

+from flac_archive.tags import Tags
+

 ################################################################################
 # The child processes
 
 ################################################################################
 # The child processes
 

-def flac2mp3(fn, title, artist, album, date, track, skip_until, pics=None):
+def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
+             track, skip_until):

     (title, artist, album) = [(x == None and 'unknown') or x
                               for x in (title, artist, album)]
     if date == None:
     (title, artist, album) = [(x == None and 'unknown') or x
                               for x in (title, artist, album)]
     if date == None:


@@ -82,24 +88,57 @@ def flac2mp3(fn, title, artist, album, date, track, skip_until, pics=None):
     verbose and tmp.append('--verbose')
     lame_options = ' '.join(tmp)
 
     verbose and tmp.append('--verbose')
     lame_options = ' '.join(tmp)
 

-    outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
-                                        track, title)).replace('/', '_')
+    unquoted_fn = fn

 
     # Escape any single quotes ' so we can quote this.
 
     # Escape any single quotes ' so we can quote this.

-    (fn, title, artist,
-     album, date) = [x.replace("'", r"'\''")
-                     for x in (fn, title, artist, album, date)]
+    (fn, title, artist, album_artist,
+     album, date) = [(x or '').replace("'", r"'\''")
+                     for x in [fn, title, artist, album_artist, album, date]]

 
 

-    quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
-                                               track, title)).replace('/', '_')
+    album_artist_options = ''
+    if album_artist:
+        album_artist_options = "--tv 'TPE2=%s'" % album_artist

 
 

-    run_or_die(3, "flac %s -cd %s '%s' | lame --add-id3v2 %s --tt '%s' --ta '%s' --tl '%s' --ty '%s' --tn %d - '%s'"
-               % (flac_options, ' '.join(skip_until), fn,
-                  lame_options, title, artist, album, date, track,
-                  quoted_outfile))
+    outfile_album = album
+    discnum_options = ''
+    if discnum != None:
+        outfile_album = '%s (disc %s)' % (album, discnum)
+        discnum_options = "--tv 'TPOS=%d'" % int(discnum)

 
 

-    if pics != None:
-        taglib.add_apic_frame_to_mp3(outfile, pics)
+    quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, outfile_album,
+                                               track, title)).replace('/', '_')
+    # 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:
+        try:
+            os.unlink(picfn)
+        except:
+            pass

 
     return 0
 
 
     return 0
 


@@ -112,7 +151,8 @@ def tformat(m, s, c):
 def get_decode_args(fn):
     l = []
 
 def get_decode_args(fn):
     l = []
 

-    p = Popen(['metaflac', '--export-cuesheet-to=-', fn], stdout=PIPE)
+    p = Popen(['metaflac', '--no-utf8-convert', '--export-cuesheet-to=-', fn],
+              stdout=PIPE)

     for line in (x.rstrip() for x in p.stdout):
         m = re.search(r'INDEX 01 (\d\d):(\d\d):(\d\d)$', line)
         if m != None:
     for line in (x.rstrip() for x in p.stdout):
         m = re.search(r'INDEX 01 (\d\d):(\d\d):(\d\d)$', line)
         if m != None:


@@ -146,60 +186,16 @@ def get_decode_args(fn):
 
     return args
 
 
     return args
 

-# XXX other things should usue this; flac files, for example, should
-# get PART as part of the filelname, same as mp3s.
-class Tags(object):
-    def __init__(self):
-        self._global = {}
-        self._tags = {}
-    def __len__(self):
-        # All files have at least one track.
-        return max(1, len(self._tags))
-    def get(self, key, track=None):
-        key = key.upper()
-        try:
-            try:
-                return self._tags[track][key]
-            except KeyError:
-                return self._global[key]
-        except KeyError:
-            return None
-    def gets(self, key, track=None):
-        value = self.get(key, track)
-        if value == None:
-            return None
-        return '\n'.join(value)
-    def set(self, key, value, track=None):
-        key = key.upper()
-        if track == None:
-            tags = self._global
-        else:
-            try:
-                tags = self._tags[track]
-            except KeyError:
-                tags = self._tags[track] = {}
-        if key not in tags:
-            tags[key] = []
-        tags[key].append(value)
-

 def get_tags(fn):
     """Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
     in the file FN."""
 
     tags = Tags()
 
 def get_tags(fn):
     """Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
     in the file FN."""
 
     tags = Tags()
 

-    p = Popen(['metaflac', '--export-tags-to=-', fn], stdout=PIPE)
-    for line in (x.rstrip() for x in p.stdout):
-        (tag, value) = line.split('=', 1)
+    p = Popen(['metaflac', '--no-utf8-convert', '--export-tags-to=-', fn],
+              stdout=PIPE)
+    tags.load(p.stdout)

 
 

-        m = re.search(r'\[([0-9]+)]$', tag)
-        if m != None:
-            tag = tag[:m.start()]
-            track = int(m.group(1))
-        else:
-            track = None
-
-        tags.set(tag, value, track)

     # XXX dataloss!  check status
     status = p.wait()
 
     # XXX dataloss!  check status
     status = p.wait()
 


@@ -215,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('--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
     except:
         traceback.print_exc()
         return 2


@@ -228,8 +226,11 @@ def main(argv):
         traceback.print_exc()
         return 2
 
         traceback.print_exc()
         return 2
 

+    separator = ' '

     try:
         global debug, flac_options, lame_options, quiet, verbose
     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
         debug = options.debug
         lame_options = options.lame_options
         quiet = options.quiet


@@ -241,14 +242,10 @@ def main(argv):
                 args = get_decode_args(fn)
 
                 tags = get_tags(fn)
                 args = get_decode_args(fn)
 
                 tags = get_tags(fn)

-                album = tags.gets('ALBUM')
+                album = tags.gets('ALBUM', separator=separator)

                 discnum = tags.gets('DISCNUMBER')
                 track = tags.gets('TRACKNUMBER')
 
                 discnum = tags.gets('DISCNUMBER')
                 track = tags.gets('TRACKNUMBER')
 

-                # lame doesn't seem to support disc number.
-                if discnum != None:
-                    album = '%s (disc %s)' % (album, discnum)
-

                 # Stupid hack: only a single-track file should have the
                 # TRACKNUMBER tag, so use it if set for the first pass through
                 # the loop.  At the end of the loop, we'll set $track for the
                 # Stupid hack: only a single-track file should have the
                 # TRACKNUMBER tag, so use it if set for the first pass through
                 # the loop.  At the end of the loop, we'll set $track for the


@@ -258,18 +255,32 @@ def main(argv):
                 else:
                     track = int(track)
 
                 else:
                     track = int(track)
 

-                pics = flac.get_pictures(fn)
-

                 for i in range(len(tags)):
                 for i in range(len(tags)):

-                    title = tags.gets('TITLE', track)
+                    title = tags.gets('TITLE', track, separator)

                     part = tags.gets('PART', track)
                     if part != None:
                         title = '%s - %s' % (title, part)
                     part = tags.gets('PART', track)
                     if part != None:
                         title = '%s - %s' % (title, part)

-                    jobs.append([fn, title,
-                                 tags.gets('ARTIST', track),
-                                 album,
+                    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)
+                    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),
                                  tags.gets('DATE', track),

-                                 track, args[i], pics])
+                                 track, args[i]))

                     track = i + 2
             except Exception, error:
                 sys.stderr.write(getattr(error, 'msg', ''))
                     track = i + 2
             except Exception, error:
                 sys.stderr.write(getattr(error, 'msg', ''))