From f8abb03b401135cefb416af5b2742f4248a5fb76 Mon Sep 17 00:00:00 2001
From: Matthias Kiefer <matthias.kiefer@1und1.de>
Date: Mon, 27 Oct 2014 16:10:17 +0100
Subject: [PATCH 1/2] Added support for APEv2 cover tags

---
 beets/mediafile.py     |  67 ++++++++++++++++++++++++++++++++++++++++-
 test/rsrc/image.ape    | Bin 0 -> 14279 bytes
 test/test_mediafile.py |   3 +-
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 test/rsrc/image.ape

diff --git a/beets/mediafile.py b/beets/mediafile.py
index 95bbd309dd..11c0459fdd 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -868,7 +868,7 @@ class VorbisImageStorageStyle(ListStorageStyle):
     base64-encoded. Values are `Image` objects.
     """
     formats = ['OggOpus', 'OggTheora', 'OggSpeex', 'OggVorbis',
-               'OggFlac', 'APEv2File', 'WavPack', 'Musepack', 'MonkeysAudio']
+               'OggFlac']
 
     def __init__(self):
         super(VorbisImageStorageStyle, self).__init__(
@@ -950,6 +950,70 @@ def delete(self, mutagen_file):
         mutagen_file.clear_pictures()
 
 
+class APEv2ImageStorageStyle(ListStorageStyle):
+    """Store images in APEv2 tags. Values are `Image` objects.
+    """
+    formats = ['APEv2File', 'WavPack', 'Musepack', 'MonkeysAudio', 'OptimFROG']
+
+    _APE_COVER_TAG_NAMES = {ImageType.other: 'Cover Art (other)',
+                            ImageType.icon: 'Cover Art (icon)',
+                            ImageType.other_icon: 'Cover Art (other icon)',
+                            ImageType.front: 'Cover Art (front)',
+                            ImageType.back: 'Cover Art (back)',
+                            ImageType.leaflet: 'Cover Art (leaflet)',
+                            ImageType.media: 'Cover Art (media)',
+                            ImageType.lead_artist: 'Cover Art (lead)',
+                            ImageType.artist: 'Cover Art (artist)',
+                            ImageType.conductor: 'Cover Art (conductor)',
+                            ImageType.group: 'Cover Art (band)',
+                            ImageType.composer: 'Cover Art (composer)',
+                            ImageType.lyricist: 'Cover Art (lyricist)',
+                            ImageType.recording_location: 'Cover Art (studio)',
+                            ImageType.recording_session: 'Cover Art (recording)',
+                            ImageType.performance: 'Cover Art (performance)',
+                            ImageType.screen_capture: 'Cover Art (movie scene)',
+                            ImageType.fish: 'Cover Art (colored fish)',
+                            ImageType.illustration: 'Cover Art (illustration)',
+                            ImageType.artist_logo: 'Cover Art (band logo)',
+                            ImageType.publisher_logo: 'Cover Art (publisher logo)'
+                            }
+
+    def __init__(self):
+        super(APEv2ImageStorageStyle, self).__init__(key='')
+
+    def fetch(self, mutagen_file):
+        images = []
+        for cover_type, cover_tag in APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.iteritems():
+            try:
+                frame = mutagen_file[cover_tag]
+                text_delimiter_index = frame.value.find('\x00')
+                comment = frame.value[0:text_delimiter_index] if text_delimiter_index > 0 else None
+                image_data = frame.value[text_delimiter_index+1:]
+                images.append(Image(data=image_data, type=cover_type, desc=comment))
+            except KeyError:
+                pass
+
+        return images
+
+    def set_list(self, mutagen_file, values):
+        self.delete(mutagen_file)
+
+        for image in values:
+            image_type = image.type if image.type is not None else ImageType.other
+            comment = image.desc if image.desc else ''
+            image_data = comment + "\x00" + image.data
+            cover_tag = APEv2ImageStorageStyle._APE_COVER_TAG_NAMES[image_type]
+            mutagen_file[cover_tag] = image_data
+
+    def delete(self, mutagen_file):
+        """Remove all images from the file.
+        """
+        for cover_tag in APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.itervalues():
+            try:
+                del mutagen_file[cover_tag]
+            except KeyError:
+                pass
+
 # MediaField is a descriptor that represents a single logical field. It
 # aggregates several StorageStyles describing how to access the data for
 # each file type.
@@ -1206,6 +1270,7 @@ def __init__(self):
             ASFImageStorageStyle(),
             VorbisImageStorageStyle(),
             FlacImageStorageStyle(),
+            APEv2ImageStorageStyle(),
         )
 
     def __get__(self, mediafile, _):
diff --git a/test/rsrc/image.ape b/test/rsrc/image.ape
new file mode 100644
index 0000000000000000000000000000000000000000..f8a559289eac60d0dcc3a81cb1bac42640b8ac44
GIT binary patch
literal 14279
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
N{~sQ`fdBI_{|{5%VQc^Z

literal 0
HcmV?d00001

diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index 56a7bf5724..7a44f602c9 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -822,7 +822,8 @@ class FlacTest(ReadWriteTestBase, PartialTestMixin,
     }
 
 
-class ApeTest(ReadWriteTestBase, unittest.TestCase):
+class ApeTest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
+              unittest.TestCase):
     extension = 'ape'
     audio_properties = {
         'length': 1.0,

From 4a33fe7158065bad2adc9683ccc8cc2ea0e1658d Mon Sep 17 00:00:00 2001
From: Matthias Kiefer <matthias.kiefer@1und1.de>
Date: Tue, 28 Oct 2014 08:25:44 +0100
Subject: [PATCH 2/2] Style adjustments

---
 beets/mediafile.py | 63 +++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/beets/mediafile.py b/beets/mediafile.py
index 11c0459fdd..ace8288b40 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -955,41 +955,44 @@ class APEv2ImageStorageStyle(ListStorageStyle):
     """
     formats = ['APEv2File', 'WavPack', 'Musepack', 'MonkeysAudio', 'OptimFROG']
 
-    _APE_COVER_TAG_NAMES = {ImageType.other: 'Cover Art (other)',
-                            ImageType.icon: 'Cover Art (icon)',
-                            ImageType.other_icon: 'Cover Art (other icon)',
-                            ImageType.front: 'Cover Art (front)',
-                            ImageType.back: 'Cover Art (back)',
-                            ImageType.leaflet: 'Cover Art (leaflet)',
-                            ImageType.media: 'Cover Art (media)',
-                            ImageType.lead_artist: 'Cover Art (lead)',
-                            ImageType.artist: 'Cover Art (artist)',
-                            ImageType.conductor: 'Cover Art (conductor)',
-                            ImageType.group: 'Cover Art (band)',
-                            ImageType.composer: 'Cover Art (composer)',
-                            ImageType.lyricist: 'Cover Art (lyricist)',
-                            ImageType.recording_location: 'Cover Art (studio)',
-                            ImageType.recording_session: 'Cover Art (recording)',
-                            ImageType.performance: 'Cover Art (performance)',
-                            ImageType.screen_capture: 'Cover Art (movie scene)',
-                            ImageType.fish: 'Cover Art (colored fish)',
-                            ImageType.illustration: 'Cover Art (illustration)',
-                            ImageType.artist_logo: 'Cover Art (band logo)',
-                            ImageType.publisher_logo: 'Cover Art (publisher logo)'
-                            }
+    _APE_COVER_TAG_NAMES = {
+        ImageType.other: 'Cover Art (other)',
+        ImageType.icon: 'Cover Art (icon)',
+        ImageType.other_icon: 'Cover Art (other icon)',
+        ImageType.front: 'Cover Art (front)',
+        ImageType.back: 'Cover Art (back)',
+        ImageType.leaflet: 'Cover Art (leaflet)',
+        ImageType.media: 'Cover Art (media)',
+        ImageType.lead_artist: 'Cover Art (lead)',
+        ImageType.artist: 'Cover Art (artist)',
+        ImageType.conductor: 'Cover Art (conductor)',
+        ImageType.group: 'Cover Art (band)',
+        ImageType.composer: 'Cover Art (composer)',
+        ImageType.lyricist: 'Cover Art (lyricist)',
+        ImageType.recording_location: 'Cover Art (studio)',
+        ImageType.recording_session: 'Cover Art (recording)',
+        ImageType.performance: 'Cover Art (performance)',
+        ImageType.screen_capture: 'Cover Art (movie scene)',
+        ImageType.fish: 'Cover Art (colored fish)',
+        ImageType.illustration: 'Cover Art (illustration)',
+        ImageType.artist_logo: 'Cover Art (band logo)',
+        ImageType.publisher_logo: 'Cover Art (publisher logo)'}
 
     def __init__(self):
         super(APEv2ImageStorageStyle, self).__init__(key='')
 
     def fetch(self, mutagen_file):
         images = []
-        for cover_type, cover_tag in APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.iteritems():
+        for cover_type, cover_tag in \
+                APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.iteritems():
             try:
                 frame = mutagen_file[cover_tag]
                 text_delimiter_index = frame.value.find('\x00')
-                comment = frame.value[0:text_delimiter_index] if text_delimiter_index > 0 else None
-                image_data = frame.value[text_delimiter_index+1:]
-                images.append(Image(data=image_data, type=cover_type, desc=comment))
+                comment = frame.value[0:text_delimiter_index] \
+                    if text_delimiter_index > 0 else None
+                image_data = frame.value[text_delimiter_index + 1:]
+                images.append(Image(data=image_data, type=cover_type,
+                                    desc=comment))
             except KeyError:
                 pass
 
@@ -999,8 +1002,8 @@ def set_list(self, mutagen_file, values):
         self.delete(mutagen_file)
 
         for image in values:
-            image_type = image.type if image.type is not None else ImageType.other
-            comment = image.desc if image.desc else ''
+            image_type = image.type or ImageType.other
+            comment = image.desc or ''
             image_data = comment + "\x00" + image.data
             cover_tag = APEv2ImageStorageStyle._APE_COVER_TAG_NAMES[image_type]
             mutagen_file[cover_tag] = image_data
@@ -1008,12 +1011,14 @@ def set_list(self, mutagen_file, values):
     def delete(self, mutagen_file):
         """Remove all images from the file.
         """
-        for cover_tag in APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.itervalues():
+        for cover_tag in \
+                APEv2ImageStorageStyle._APE_COVER_TAG_NAMES.itervalues():
             try:
                 del mutagen_file[cover_tag]
             except KeyError:
                 pass
 
+
 # MediaField is a descriptor that represents a single logical field. It
 # aggregates several StorageStyles describing how to access the data for
 # each file type.