X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/082b54df18a7024d03047b437dd45c289c3272bf..f01bc9f6b79b2123a158f1462ec00fc63dedc889:/flac2mp3 diff --git a/flac2mp3 b/flac2mp3 index 98558d9..1e29ad0 100755 --- a/flac2mp3 +++ b/flac2mp3 @@ -1,6 +1,6 @@ #! /usr/bin/env python2.4 -''' +""" =head1 NAME B - transcode FLAC file to MP3 files @@ -48,7 +48,7 @@ Written by Eric Gillespie . =cut -''' #' # python-mode is sucks +""" import re, sys, traceback from optparse import OptionParser @@ -153,7 +153,8 @@ class Tags(object): self._global = {} self._tags = {} def __len__(self): - return len(self._tags) + # All files have at least one track. + return max(1, len(self._tags)) def get(self, key, track=None): key = key.upper() try: @@ -182,8 +183,8 @@ class Tags(object): tags[key].append(value) 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() @@ -204,15 +205,6 @@ def get_tags(fn): return tags -def find_pics(fn, tags): - pics = tags.get('__flac2mp3_PICTURE') - - if not isinstance(pics, list): - pics = flac.get_pictures(fn) - tags.set('__flac2mp3_PICTURE', pics) - - return pics - def main(argv): # Control the exit code for any uncaught exceptions. try: @@ -266,6 +258,8 @@ def main(argv): else: track = int(track) + pics = flac.get_pictures(fn) + for i in range(len(tags)): title = tags.gets('TITLE', track) part = tags.gets('PART', track) @@ -275,7 +269,7 @@ def main(argv): tags.gets('ARTIST', track), album, tags.gets('DATE', track), - track, args[i], find_pics(fn, tags)]) + track, args[i], pics]) track = i + 2 except Exception, error: sys.stderr.write(getattr(error, 'msg', ''))