From aa391ecdd1157408af744d9e1b02a3fa7a1f72c8 Mon Sep 17 00:00:00 2001
From: Daniel Erat <dan@erat.org>
Date: Mon, 5 May 2014 20:45:58 -0700
Subject: [PATCH] index: Index MusicBrainz album IDs from music files.

Index "MusicBrainz Album ID" ID3v2 frames as
"musicbrainzalbumid" media tags to facilitate downloading
cover art from coverartarchive.org.

Change-Id: Ie81017dd6f76ec355ee0d1daedfb7180cb70ad59
---
 pkg/index/indextest/testdata/0s.mp3 | Bin 1393 -> 1393 bytes
 pkg/index/indextest/tests.go        |   1 +
 pkg/index/receive.go                |  19 ++++++++++---------
 pkg/search/query.go                 |   2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/index/indextest/testdata/0s.mp3 b/pkg/index/indextest/testdata/0s.mp3
index 0fb9b070dda7be11a809726f909341775affd4dd..7e4a59dedf0834e81e3353b436679749607233b8 100644
GIT binary patch
delta 112
zcmey!^^t4Bn#72R2nGfQD<JkQEzV4KDoV`Et5R^xNh-}%@JwMafC60*jYh!aLR>=J
lf%-*&*vP=pMAyJn*T5{qz}U*z)XKzU<Hae=lNYjF004VB93B7w

delta 49
zcmey!^^t4B8d;YRcLoLq5g;})Ff`FMFw`|N3^6dVGBmd`Fxo80IDvVx0;9*|g)A2U
DG!zVa

diff --git a/pkg/index/indextest/tests.go b/pkg/index/indextest/tests.go
index 64ff74d8b..d727f74eb 100644
--- a/pkg/index/indextest/tests.go
+++ b/pkg/index/indextest/tests.go
@@ -406,6 +406,7 @@ func Index(t *testing.T, initIdx func() *index.Index) {
 		{"artist", "Test Artist"},
 		{"album", "Test Album"},
 		{"genre", "(20)Alternative"},
+		{"musicbrainzalbumid", "00000000-0000-0000-0000-000000000000"},
 		{"year", "1992"},
 		{"track", "1"},
 		{"disc", "2"},
diff --git a/pkg/index/receive.go b/pkg/index/receive.go
index d7c73832c..151da3b9c 100644
--- a/pkg/index/receive.go
+++ b/pkg/index/receive.go
@@ -567,15 +567,16 @@ func indexMusic(r types.SizeReaderAt, wholeRef blob.Ref, mm *mutationMap) {
 	// Note: if you add to this map, please update
 	// pkg/search/query.go's MediaTagConstraint Tag docs.
 	tags := map[string]string{
-		"title":      tag.Title(),
-		"artist":     tag.Artist(),
-		"album":      tag.Album(),
-		"genre":      tag.Genre(),
-		"year":       yearStr,
-		"track":      trackStr,
-		"disc":       discStr,
-		"mediaref":   mediaRef.String(),
-		"durationms": durationStr,
+		"title":              tag.Title(),
+		"artist":             tag.Artist(),
+		"album":              tag.Album(),
+		"genre":              tag.Genre(),
+		"musicbrainzalbumid": tag.CustomFrames()["MusicBrainz Album Id"],
+		"year":               yearStr,
+		"track":              trackStr,
+		"disc":               discStr,
+		"mediaref":           mediaRef.String(),
+		"durationms":         durationStr,
 	}
 
 	for tag, value := range tags {
diff --git a/pkg/search/query.go b/pkg/search/query.go
index 10bc57163..6aae336bf 100644
--- a/pkg/search/query.go
+++ b/pkg/search/query.go
@@ -333,7 +333,7 @@ type FileConstraint struct {
 
 type MediaTagConstraint struct {
 	// Tag is the tag to match.
-	// For ID3, this includes: title, artist, album, genre, year, track, disc, mediaref, durationms.
+	// For ID3, this includes: title, artist, album, genre, musicbrainzalbumid, year, track, disc, mediaref, durationms.
 	Tag string `json:"tag"`
 
 	String *StringConstraint `json:"string,omitempty"`