Hmm, some standardization sitting around in a working copy since November...

[flac-archive] / flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 000d8ef22a0c68495e8b7e215354ecc6e64c65f5..d9f9f7ba2c79f4628beb9d2c7fb491f5a1cbeaa2 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -67,7 +67,7 @@ from flac_archive.tags import Tags
 ################################################################################
 # The child processes
 
 ################################################################################
 # The child processes
 

-def flac2mp3(fn, title, artist, album_artist, album, date,
+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)]
              track, skip_until, pics=None):
     (title, artist, album) = [(x == None and 'unknown') or x
                               for x in (title, artist, album)]


@@ -89,9 +89,6 @@ def flac2mp3(fn, title, artist, album_artist, album, date,
     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('/', '_')
-

     # Escape any single quotes ' so we can quote this.
     (fn, title, artist, album_artist,
      album, date) = [(x or '').replace("'", r"'\''")
     # Escape any single quotes ' so we can quote this.
     (fn, title, artist, album_artist,
      album, date) = [(x or '').replace("'", r"'\''")


@@ -101,7 +98,13 @@ def flac2mp3(fn, title, artist, album_artist, album, date,
     if album_artist:
         album_artist_options = "--tv 'TPE2=%s'" % album_artist
 
     if album_artist:
         album_artist_options = "--tv 'TPE2=%s'" % album_artist
 

-    quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
+    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
                                                track, title)).replace('/', '_')
 
     pic_options = None


@@ -112,10 +115,11 @@ def flac2mp3(fn, title, artist, album_artist, album, date,
         f.close()
         pic_options = "--ti '%s'" % picfn
     try:
         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'"
+        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,
                    % (flac_options, ' '.join(skip_until), fn,
                       lame_options, title, artist, album, date, track,

-                      pic_options, album_artist_options, quoted_outfile))
+                      pic_options, album_artist_options,
+                      discnum_options, quoted_outfile))

     finally:
         if pic_options:
             try:
     finally:
         if pic_options:
             try:


@@ -134,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:


@@ -174,7 +179,8 @@ def get_tags(fn):
 
     tags = Tags()
 
 
     tags = Tags()
 

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

     tags.load(p.stdout)
 
     # XXX dataloss!  check status
     tags.load(p.stdout)
 
     # XXX dataloss!  check status


@@ -223,10 +229,6 @@ def main(argv):
                 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


@@ -249,11 +251,11 @@ def main(argv):
                     artist = tags.get('ARTIST', track)
                     artist.extend(tags.get('FEATURING', track))
                     album_artist = tags.gets('ALBUMARTIST', track)
                     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,

                                  ', '.join(artist),
                                  ', '.join(artist),

-                                 album_artist, album,
+                                 album_artist, album, discnum,

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

-                                 track, args[i], pics])
+                                 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', ''))