From 67dc54f01b7abd20db7d6edeadd97cff31379fad Mon Sep 17 00:00:00 2001
From: Bonham84 <headphones@headphones-virtual-machine.(none)>
Date: Tue, 15 Oct 2013 23:53:31 +0000
Subject: [PATCH] Handle FLAC albumart correctly.

---
 lib/beets/mediafile.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/beets/mediafile.py b/lib/beets/mediafile.py
index 785ce2a9..905d70e0 100644
--- a/lib/beets/mediafile.py
+++ b/lib/beets/mediafile.py
@@ -572,9 +572,23 @@ class ImageField(object):
 
             # No cover found.
             return None
+	elif obj.type == 'flac':
+            if 'metadata_block_picture' not in obj.mgfile:
+                return None
+
+            for data in obj.mgfile['metadata_block_picture']:
+                try:
+                    pic = lib.mutagen.flac.Picture(data)
+                    break
+                except TypeError:
+                    pass
+            else:
+                return None
+
+            return pic.data
 
         else:
-            # Here we're assuming everything but MP3 and MPEG-4 uses
+	    # Here we're assuming everything but MP3, FLAC and MPEG-4 use
             # the Xiph/Vorbis Comments standard. This may not be valid.
             # http://wiki.xiph.org/VorbisComment#Cover_art
 
@@ -623,6 +637,13 @@ class ImageField(object):
             else:
                 cover = lib.mutagen.mp4.MP4Cover(val, self._mp4kind(val))
                 obj.mgfile['covr'] = [cover]
+	
+        elif obj.type == 'flac':
+            if val is None:
+                pic = lib.mutagen.flac.Picture()
+                pic.data = val
+                pic.mime = self._mime(val)
+                obj.mgfile['metadata_block_picture'] = [pic.write()]
 
         else:
             # Again, assuming Vorbis Comments standard.