Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-24 00:02:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix music-crawl error messages (thanks, derwin)

Browse source 
Due to the new exception nesting stuff, we were catching and emitting
exceptions where none was necessary: specifically, when the file was non-music
(which is expected, especially when there are images).
This commit is contained in:
Adrian Sampson 2014-08-10 17:18:10 -07:00
parent 60c59ca96a
commit 945e30d155
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
beets/autotag/__init__.py
View file

@ -52,16 +52,19 @@ def albums_in_dir(path):
for filename in files:
try:
i = library.Item.from_path(os.path.join(root, filename))
except mediafile.FileTypeError:
pass
except mediafile.UnreadableFileError:
log.warn(u'unreadable file: {0}'.format(
displayable_path(filename))
)
except library.ReadError as exc:
log.error(u'error reading {0}: {1}'.format(
displayable_path(filename), exc
))
if isinstance(exc.reason, mediafile.FileTypeError):
# Silently ignore non-music files.
pass
elif isinstance(exc.reason, mediafile.UnreadableFileError):
log.warn(u'unreadable file: {0}'.format(
displayable_path(filename))
)
else:
log.error(u'error reading {0}: {1}'.format(
displayable_path(filename),
exc,
))
else:
items.append(i)