drop unused, strange make_filename returning just the album (wtf?); doesn't

[flac-archive] / flac2mp3

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

 
 

-'''
+"""

 =head1 NAME
 
 B<flac2mp3> - transcode FLAC file to MP3 files
 =head1 NAME
 
 B<flac2mp3> - transcode FLAC file to MP3 files


@@ -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


@@ -48,26 +52,27 @@ Written by Eric Gillespie <epg@pretzelnet.org>.
 
 =cut
 
 
 =cut
 

-''' #' # python-mode is sucks
+"""

 
 

-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 import flac
+from flac_archive.tags import Tags
+

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

-def flac2mp3(fn, title, artist, album, date, track, skip_until, pic=None):
-    (title, artist, album, date) = [(x == None and 'unknown') or x
-                                    for x in (title, artist, album, date)]
-    try:
-        (skip_arg, until_arg) = skip_until
-    except ValueError:
-        skip_arg = until_arg = ''
+def flac2mp3(fn, title, artist, album_artist, album, discnum, date,
+             track, skip_until, pics=None):
+    (title, artist, album) = [(x == None and 'unknown') or x
+                              for x in (title, artist, album)]
+    if date == None:
+        date = ''

 
     if quiet:
         flac_options = '--silent'
 
     if quiet:
         flac_options = '--silent'


@@ -85,19 +90,42 @@ def flac2mp3(fn, title, artist, album, date, track, skip_until, pic=None):
     lame_options = ' '.join(tmp)
 
     # Escape any single quotes ' so we can quote this.
     lame_options = ' '.join(tmp)
 
     # 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)]
-
-    outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
-                                        track, title)).replace('/', '_')
-
-    run_or_die(3, "flac %s -cd %s %s '%s' | lame --add-id3v2 %s --tt '%s' --ta '%s' --tl '%s' --ty '%s' --tn %d - '%s'"
-               % (flac_options, skip_arg or '', until_arg or '', fn,
-                  lame_options, title, artist, album, date, track, outfile))
-
-    if pic != None:
-        taglib.add_apic_frame_to_mp3(outfile, pic[0], pic[1], pic[2])
+    (fn, title, artist, album_artist,
+     album, date) = [(x or '').replace("'", r"'\''")
+                     for x in [fn, title, artist, album_artist, album, date]]
+
+    album_artist_options = ''
+    if album_artist:
+        album_artist_options = "--tv 'TPE2=%s'" % album_artist
+
+    outfile_album = album
+    discnum_options = ''
+    if discnum != None:
+        outfile_album = '%s (disc %s)' % (album, discnum)
+        discnum_options = "--tv 'TPOS=%d'" % int(discnum)
+
+    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()
+        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 - '%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

 
     return 0
 
 
     return 0
 


@@ -110,7 +138,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:


@@ -144,71 +173,21 @@ 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._tags = {}
-    def __len__(self):
-        return len(self._tags)
-    def get(self, key, track=None):
-        key = key.upper()
-        try:
-            if track == None:
-                return self._tags[None][key]
-            try:
-                return self._tags[track][key]
-            except KeyError:
-                return self._tags[None][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):
-        if track not in self._tags:
-            self._tags[track] = {}
-        if key not in self._tags[track]:
-            self._tags[track][key] = []
-        self._tags[track][key].append(value)
-

 def get_tags(fn):
 def get_tags(fn):

-    '''Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
-    in the file FN.'''
+    """Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
+    in the file FN."""

 
     tags = Tags()
 
 
     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()
 
     return tags
 
     # XXX dataloss!  check status
     status = p.wait()
 
     return tags
 

-def find_pic(fn, tags):
-    pic = tags.get('__flac2mp3_PICTURE')
-
-    if not isinstance(pic, tuple):
-        for i in flac.get_pictures(fn):
-            if i[1] == flac.PICTURE_TYPE_FRONT_COVER:
-                pic = i[:3]
-                break
-        tags.set('__flac2mp3_PICTURE', pic)
-
-    return pic
-

 def main(argv):
     # Control the exit code for any uncaught exceptions.
     try:
 def main(argv):
     # Control the exit code for any uncaught exceptions.
     try:


@@ -232,6 +211,7 @@ def main(argv):
         traceback.print_exc()
         return 2
 
         traceback.print_exc()
         return 2
 

+    separator = ' '

     try:
         global debug, flac_options, lame_options, quiet, verbose
         debug = options.debug
     try:
         global debug, flac_options, lame_options, quiet, verbose
         debug = options.debug


@@ -245,14 +225,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


@@ -262,16 +238,24 @@ 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)
+                    jobs.append((fn, title,
+                                 ', '.join(artist),
+                                 album_artist, album, discnum,

                                  tags.gets('DATE', track),
                                  tags.gets('DATE', track),

-                                 track, args[i], find_pic(fn, tags)])
+                                 track, args[i], pics))

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