From 10dfa780d1538fa368ba983da7d2351a0bb6bfbf Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Tue, 29 Jan 2013 21:46:58 -0800 Subject: [PATCH] fix crash when WMA is missing cover art (#75) --- beets/mediafile.py | 18 +++++++++--------- test/test_mediafile_basic.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/beets/mediafile.py b/beets/mediafile.py index 977d24fb9..40ffd7aa3 100644 --- a/beets/mediafile.py +++ b/beets/mediafile.py @@ -618,15 +618,15 @@ class ImageField(object): return None elif obj.type == 'asf': - pictures = obj.mgfile['WM/Picture'] - if pictures: - data = pictures[0].value - try: - return _unpack_asf_image(data)[1] - except: - return None - else: - return None + if 'WM/Picture' in obj.mgfile: + pictures = obj.mgfile['WM/Picture'] + if pictures: + data = pictures[0].value + try: + return _unpack_asf_image(data)[1] + except: + return None + return None else: # Here we're assuming everything but MP3, MPEG-4, and FLAC diff --git a/test/test_mediafile_basic.py b/test/test_mediafile_basic.py index 24b2faf11..9ff72e785 100644 --- a/test/test_mediafile_basic.py +++ b/test/test_mediafile_basic.py @@ -198,11 +198,11 @@ READ_ONLY_CORRECT_DICTS = { 'full.wma': { 'length': 1.0, - 'bitrate': 23, + 'bitrate': 128000, 'format': 'Windows Media', 'samplerate': 44100, 'bitdepth': 0, - 'channels': 2, + 'channels': 1, }, }