import org.diplodocus.jobs
from org.diplodocus.util import run_or_die
-from flac_archive import flac
from flac_archive.tags import Tags
################################################################################
# The child processes
-def flac2mp3(fn, title, artist, album_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:
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.
(fn, title, artist, album_artist,
if album_artist:
album_artist_options = "--tv 'TPE2=%s'" % album_artist
- quoted_outfile = ('%s (%s) %02d %s.mp3' % (artist, album,
- track, title)).replace('/', '_')
+ outfile_album = album
+ discnum_options = ''
+ if discnum != None:
+ outfile_album = '%s (disc %s)' % (album, discnum)
+ discnum_options = "--tv 'TPOS=%d'" % int(discnum)
- pic_options = None
- if pics:
- (fd, picfn) = tempfile.mkstemp()
- f = os.fdopen(fd, 'wb')
- f.write(pics[0][7])
- f.close()
+ 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:
- 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'"
+ # 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, quoted_outfile))
+ pic_options, album_artist_options,
+ discnum_options, quoted_outfile))
finally:
- if pic_options:
- try:
- os.unlink(picfn)
- except:
- pass
+ try:
+ os.unlink(picfn)
+ except:
+ pass
return 0
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:
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
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
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
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
else:
track = int(track)
- pics = flac.get_pictures(fn)
-
for i in range(len(tags)):
title = tags.gets('TITLE', track, separator)
part = tags.gets('PART', track)
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])
+ 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]))
track = i + 2
except Exception, error:
sys.stderr.write(getattr(error, 'msg', ''))
projects / flac-archive / blobdiff