From 3057358cfcc0245a1515ed47fc00cc7d3ce1866e Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Wed, 7 Nov 2012 23:54:00 +0100
Subject: [PATCH] Index the dimensions of images.

---
 pkg/index/index.go                    |   8 +++---
 pkg/index/indextest/testdata/dude.jpg | Bin 0 -> 1932 bytes
 pkg/index/indextest/tests.go          |  34 ++++++++++++++++++++++++--
 pkg/index/keys.go                     |  12 +++++++++
 pkg/index/receive.go                  |  34 +++++++++++++++++++++++++-
 5 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 pkg/index/indextest/testdata/dude.jpg

diff --git a/pkg/index/index.go b/pkg/index/index.go
index 7f7001778..58590a5d3 100644
--- a/pkg/index/index.go
+++ b/pkg/index/index.go
@@ -586,10 +586,10 @@ func (x *Index) EdgesTo(ref *blobref.BlobRef, opts *search.EdgesToOpts) (edges [
 	}
 	for _, parentRef := range permanodeParents {
 		edges = append(edges, &search.Edge{
-			From:      parentRef,
-			FromType:  "permanode",
-			To:        ref,
-                })
+			From:     parentRef,
+			FromType: "permanode",
+			To:       ref,
+		})
 	}
 	return edges, nil
 }
diff --git a/pkg/index/indextest/testdata/dude.jpg b/pkg/index/indextest/testdata/dude.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..447710ecc79f39cd08c0d10fe10261d622c84758
GIT binary patch
literal 1932
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
UQ30BRsBphB#)5h?SWpq~UkR^2zyJUM

literal 0
HcmV?d00001

diff --git a/pkg/index/indextest/tests.go b/pkg/index/indextest/tests.go
index 929e1be5e..6f3fd0158 100644
--- a/pkg/index/indextest/tests.go
+++ b/pkg/index/indextest/tests.go
@@ -18,6 +18,7 @@ package indextest
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -253,6 +254,30 @@ func Index(t *testing.T, initIdx func() *index.Index) {
 	t.Logf("add-attribute claim %q points to member permanode %q", memberRef, pnChild)
 	memberRefTime := id.lastTime()
 
+	// TODO(bradfitz): add EXIF tests here, once that stuff is ready.
+	if false {
+		for i := 1; i <= 8; i++ {
+			fileBase := fmt.Sprintf("f%d-exif.jpg", i)
+			fileName := filepath.Join(findGoPathPackage("camlistore.org"), "pkg", "images", "testdata", fileBase)
+			contents, err := ioutil.ReadFile(fileName)
+			if err != nil {
+				t.Fatal(err)
+			}
+			id.UploadFile(fileBase, string(contents))
+		}
+	}
+
+	// Upload a basic image.
+	var jpegFileRef *blobref.BlobRef
+	{
+		fileName := filepath.Join(findGoPathPackage("camlistore.org"), "pkg", "index", "indextest", "testdata", "dude.jpg")
+		contents, err := ioutil.ReadFile(fileName)
+		if err != nil {
+			t.Fatal(err)
+		}
+		jpegFileRef, _ = id.UploadFile("dude.jpg", string(contents))
+	}
+
 	lastPermanodeMutation := id.lastTime()
 	id.dumpIndex(t)
 
@@ -261,6 +286,11 @@ func Index(t *testing.T, initIdx func() *index.Index) {
 		t.Fatalf("%q = %q, want %q", key, g, e)
 	}
 
+	key = "imagesize|" + jpegFileRef.String()
+	if g, e := id.Get(key), "50|100"; g != e {
+		t.Errorf("JPEG dude.jpg key %q = %q; want %q", key, g, e)
+	}
+
 	key = "have:" + pn.String()
 	pnSizeStr := id.Get(key)
 	if pnSizeStr == "" {
@@ -519,8 +549,8 @@ func EdgesTo(t *testing.T, initIdx func() *index.Index) {
 			t.Fatalf("num edges = %d; want 1", len(edges))
 		}
 		wantEdge := &search.Edge{
-			From: pn1,
-			To: pn2,
+			From:     pn1,
+			To:       pn2,
 			FromType: "permanode",
 		}
 		if got, want := edges[0].String(), wantEdge.String(); got != want {
diff --git a/pkg/index/keys.go b/pkg/index/keys.go
index 658ea3d65..280443c8a 100644
--- a/pkg/index/keys.go
+++ b/pkg/index/keys.go
@@ -216,4 +216,16 @@ var (
 			{"name", typeStr},       // the name, if static.
 		},
 	}
+
+	// Width and height after any EXIF rotation.
+	keyImageSize = &keyType{
+		"imagesize",
+		[]part{
+			{"fileref", typeBlobRef}, // blobref of "file" schema blob
+		},
+		[]part{
+			{"width", typeStr},
+			{"height", typeStr},
+		},
+	}
 )
diff --git a/pkg/index/receive.go b/pkg/index/receive.go
index 070b5134b..0a69f6f8c 100644
--- a/pkg/index/receive.go
+++ b/pkg/index/receive.go
@@ -21,7 +21,12 @@ import (
 	"crypto/sha1"
 	"errors"
 	"fmt"
+	"image"
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
 	"io"
+	"io/ioutil"
 	"log"
 	"strings"
 
@@ -121,7 +126,34 @@ func (ix *Index) populateFile(blobRef *blobref.BlobRef, ss *schema.Superset, bm
 		return nil
 	}
 	mime, reader := magic.MimeTypeFromReader(fr)
-	size, err := io.Copy(sha1, reader)
+
+	var copyDest io.Writer = sha1
+	var withCopyErr func(error) // or nil
+	if strings.HasPrefix(mime, "image/") {
+		pr, pw := io.Pipe()
+		copyDest = io.MultiWriter(copyDest, pw)
+		confc := make(chan *image.Config, 1)
+		go func() {
+			conf, _, err := image.DecodeConfig(pr)
+			defer io.Copy(ioutil.Discard, pr)
+			if err == nil {
+				confc <- &conf
+			} else {
+				confc <- nil
+			}
+		}()
+		withCopyErr = func(err error) {
+			pw.CloseWithError(err)
+			if conf := <-confc; conf != nil {
+				bm.Set(keyImageSize.Key(blobRef), keyImageSize.Val(fmt.Sprint(conf.Width), fmt.Sprint(conf.Height)))
+			}
+		}
+	}
+
+	size, err := io.Copy(copyDest, reader)
+	if f := withCopyErr; f != nil {
+		f(err)
+	}
 	if err != nil {
 		// TODO: job scheduling system to retry this spaced
 		// out max n times.  Right now our options are