X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/64eb2d5f080a1fa083d3cb23f3fb03a8c1665d05..3e5ac1b35b5e96d2e2e0570f163493fca75a00e3:/flac2mp3 diff --git a/flac2mp3 b/flac2mp3 index b951859..24e4a48 100755 --- a/flac2mp3 +++ b/flac2mp3 @@ -16,6 +16,10 @@ may be the kind of FLAC file B generates. That is, it 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 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 @@ -63,7 +67,7 @@ from flac_archive.tags import Tags ################################################################################ # 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)] @@ -85,9 +89,6 @@ def flac2mp3(fn, title, artist, album_artist, album, date, 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"'\''") @@ -97,22 +98,33 @@ def flac2mp3(fn, title, artist, album_artist, album, date, 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('/', '_') + # HACK! :( + if check_missing: + return quoted_outfile.replace(r"'\''", "'") - picfn = None + pic_options = '' 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 --ti '%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, - picfn, album_artist_options, quoted_outfile)) + pic_options, album_artist_options, + discnum_options, quoted_outfile)) finally: - if picfn: + if pic_options: try: os.unlink(picfn) except: @@ -129,7 +141,8 @@ def tformat(m, s, c): 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: @@ -169,7 +182,8 @@ def get_tags(fn): 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 @@ -187,6 +201,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 @@ -203,6 +219,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 @@ -218,10 +236,6 @@ def main(argv): 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 @@ -238,14 +252,27 @@ def main(argv): part = tags.gets('PART', track) if part != None: title = '%s - %s' % (title, part) + 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, + if check_missing: + mp3 = flac2mp3(fn, title, + ', '.join(artist), + album_artist, album, discnum, + tags.gets('DATE', track), + track, args[i], pics) + if not os.path.exists(mp3): + print fn + break + continue + jobs.append((fn, title, ', '.join(artist), - album_artist, album, + album_artist, album, discnum, tags.gets('DATE', track), - track, args[i], pics]) + track, args[i], pics)) track = i + 2 except Exception, error: sys.stderr.write(getattr(error, 'msg', ''))