Merge pull request #1260 from kiefermat/index_error_on_unknown_cover_…

…type Fixed IndexError on reading embedded cover art with invalid cover type
beetbox · Jan 23, 2015 · 3336f56 · 3336f56
2 parents b30c697 + b168987
commit 3336f56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/beets/mediafile.py b/beets/mediafile.py
@@ -326,7 +326,11 @@ def __init__(self, data, desc=None, type=None):
         self.data = data
         self.desc = desc
         if isinstance(type, int):
-            type = list(ImageType)[type]
+            try:
+                type = list(ImageType)[type]
+            except IndexError:
+                log.warn("ignoring unknown image type index {}", type)
+                type = ImageType.other
         self.type = type
 
     @property

diff --git a/test/rsrc/image_unknown_type.mp3 b/test/rsrc/image_unknown_type.mp3
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
@@ -730,6 +730,10 @@ class MP3Test(ReadWriteTestBase, PartialTestMixin,
         'channels': 1,
     }
 
+    def test_unknown_apic_type(self):
+        mediafile = self._mediafile_fixture('image_unknown_type')
+        self.assertEqual(mediafile.images[0].type, ImageType.other)
+
 
 class MP4Test(ReadWriteTestBase, PartialTestMixin,
               ImageStructureTestMixin, unittest.TestCase):