rename

[flac-archive] / flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 1e29ad0bc04f727d947667bf6dc8107d747cc02e..1884f615d928d26153ef48aa7971f9497f8babca 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,21 @@ 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 import flac
+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, date,
+             track, skip_until, pics=None):

     (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:


@@ -86,20 +93,35 @@ def flac2mp3(fn, title, artist, album, date, track, skip_until, pics=None):
                                         track, title)).replace('/', '_')
 
     # Escape any single quotes ' so we can quote this.
                                         track, title)).replace('/', '_')
 
     # 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]]
+
+    album_artist_options = ''
+    if album_artist:
+        album_artist_options = "--tv 'TPE2=%s'" % album_artist

 
     quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
                                                track, title)).replace('/', '_')
 
 
     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'"
-               % (flac_options, ' '.join(skip_until), fn,
-                  lame_options, title, artist, album, date, track,
-                  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
 
 
     return 0
 


@@ -146,42 +168,6 @@ 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."""
 def get_tags(fn):
     """Return the ARTIST, ALBUM, and DATE tags followed by the TITLE tags
     in the file FN."""


@@ -189,17 +175,8 @@ def get_tags(fn):
     tags = Tags()
 
     p = Popen(['metaflac', '--export-tags-to=-', fn], stdout=PIPE)
     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)
-
-        m = re.search(r'\[([0-9]+)]$', tag)
-        if m != None:
-            tag = tag[:m.start()]
-            track = int(m.group(1))
-        else:
-            track = None
+    tags.load(p.stdout)

 
 

-        tags.set(tag, value, track)

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


@@ -228,6 +205,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


@@ -241,7 +219,7 @@ 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')
 


@@ -261,13 +239,16 @@ def main(argv):
                 pics = flac.get_pictures(fn)
 
                 for i in range(len(tags)):
                 pics = flac.get_pictures(fn)
 
                 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)

+                    artist = tags.get('ARTIST', track)
+                    artist.extend(tags.get('FEATURING', track))
+                    album_artist = tags.gets('ALBUMARTIST', track)

                     jobs.append([fn, title,
                     jobs.append([fn, title,

-                                 tags.gets('ARTIST', track),
-                                 album,
+                                 ', '.join(artist),
+                                 album_artist, album,

                                  tags.gets('DATE', track),
                                  track, args[i], pics])
                     track = i + 2
                                  tags.gets('DATE', track),
                                  track, args[i], pics])
                     track = i + 2