From bccc91e40dd77b4d15d6759f2444bb2ac06a5bbb Mon Sep 17 00:00:00 2001
From: David Howden <dhowden@gmail.com>
Date: Sun, 6 Mar 2016 22:24:05 +1100
Subject: [PATCH] Fix: Detect PNG artwork when class = 0 (implicit) is set.

TODO: We should also try to detect JPEG artwork, but JPEG headers are a bit more tricky.

Fixes #19.
---
 mp4.go | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/mp4.go b/mp4.go
index 6b64014..05fcee6 100644
--- a/mp4.go
+++ b/mp4.go
@@ -5,6 +5,7 @@
 package tag
 
 import (
+	"bytes"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -14,7 +15,7 @@ import (
 )
 
 var atomTypes = map[int]string{
-	0:  "uint8",
+	0:  "implicit", // automatic based on atom name
 	1:  "text",
 	13: "jpeg",
 	14: "png",
@@ -44,6 +45,9 @@ var atoms = atomNames(map[string]string{
 	"disk":    "disc",
 })
 
+// Detect PNG image if "implicit" class is used
+var pngHeader = []byte{137, 80, 78, 71, 13, 10, 26, 10}
+
 type atomNames map[string]string
 
 func (f atomNames) Name(n string) []string {
@@ -66,7 +70,7 @@ type metadataMP4 struct {
 // non-nil error if there was a problem.
 func ReadAtoms(r io.ReadSeeker) (Metadata, error) {
 	m := metadataMP4{
-		data: make(map[string]interface{}),
+		data:     make(map[string]interface{}),
 		fileType: UnknownFileType,
 	}
 	err := m.readAtoms(r)
@@ -148,8 +152,23 @@ func (m metadataMP4) readAtomData(r io.ReadSeeker, name string, size uint32) err
 		return nil
 	}
 
+	if contentType == "implicit" {
+		if name == "covr" {
+			if bytes.HasPrefix(b, pngHeader) {
+				contentType = "png"
+			}
+			// TODO(dhowden): Detect JPEG formats too (harder).
+		}
+	}
+
 	var data interface{}
 	switch contentType {
+	case "implicit":
+		if _, ok := atoms[name]; ok {
+			return fmt.Errorf("unhandled implicit content type for required atom: %q", name)
+		}
+		return nil
+
 	case "text":
 		data = string(b)
 
@@ -225,7 +244,7 @@ func readCustomAtom(r io.ReadSeeker, size uint32) (string, uint32, error) {
 	return subNames["name"], dataSize, nil
 }
 
-func (metadataMP4) Format() Format     { return MP4 }
+func (metadataMP4) Format() Format       { return MP4 }
 func (m metadataMP4) FileType() FileType { return m.fileType }
 
 func (m metadataMP4) Raw() map[string]interface{} { return m.data }