From c91c96565f0a7d2945e4f1cc165b16add82bff41 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 14 Jul 2014 12:44:31 +0100
Subject: [PATCH] google cloud storage: set the Content-Type from the file name

---
 googlecloudstorage/googlecloudstorage.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/googlecloudstorage/googlecloudstorage.go b/googlecloudstorage/googlecloudstorage.go
index d722c84f1..30a850e30 100644
--- a/googlecloudstorage/googlecloudstorage.go
+++ b/googlecloudstorage/googlecloudstorage.go
@@ -14,6 +14,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"mime"
 	"net/http"
 	"path"
 	"regexp"
@@ -475,17 +476,20 @@ func (o *FsObjectStorage) Open() (in io.ReadCloser, err error) {
 //
 // The new object may have been created if an error is returned
 func (o *FsObjectStorage) Update(in io.Reader, modTime time.Time, size int64) error {
-	// FIXME Set the mtime
+	// Guess the content type
+	contentType := mime.TypeByExtension(path.Ext(o.remote))
+	if contentType == "" {
+		contentType = "application/octet-stream"
+	}
+
 	object := storage.Object{
 		// FIXME other stuff here? ACL??
-		Bucket: o.storage.bucket,
-		Name:   o.storage.root + o.remote,
-		// ContentType: ???
-		// Crc32c: ??? // set this - will it get checked?
-		// Md5Hash: will this get checked?
-		Size:     uint64(size),
-		Updated:  modTime.Format(RFC3339Out), // Doesn't get set
-		Metadata: metadataFromModTime(modTime),
+		Bucket:      o.storage.bucket,
+		Name:        o.storage.root + o.remote,
+		ContentType: contentType,
+		Size:        uint64(size),
+		Updated:     modTime.Format(RFC3339Out), // Doesn't get set
+		Metadata:    metadataFromModTime(modTime),
 	}
 	// FIXME ACL????
 	_, err := o.storage.svc.Objects.Insert(o.storage.bucket, &object).Media(in).Name(object.Name).Do()