can save image binary

fzxu · fzxu · commit 9b2b65455200 · 2013-11-26T01:44:54.000-08:00
diff --git a/README.md b/README.md
@@ -2,3 +2,7 @@ imgongo
 =======
 
 An image server written in go lang and uses mongodb as backend persistence.
+
+It makes good use of the 16M limitation of mongodb document in order to serve
+lots of small files. (It does not use the GridFS because all the files are
+smaller than 16M, using GridFS would be a waste of space)
diff --git a/document.go b/document.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"time"
 
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
@@ -12,18 +13,20 @@ type Document struct {
 	Name        string        `bson:"name"`
 	Path        string        `bson:"path"`
 	ContentType string        `bson:"content_type"`
+	CreatedAt   time.Time     `bson:"created_at"`
 	Binary      bson.Binary   `bson:"binary"`
 }
 
-func (d *Document) Collcetion(s *mgo.Session) *mgo.Collection {
+func (d Document) Collection(s *mgo.Session) *mgo.Collection {
 	return s.DB(Configuration.DBName).C(Configuration.Collection)
 }
 
 func (d *Document) Save(s *mgo.Session) error {
-	coll := d.Collcetion(s)
+	coll := d.Collection(s)
 
 	if !bson.IsObjectIdHex(d.Id.Hex()) {
 		d.Id = bson.NewObjectId()
+		d.CreatedAt = time.Now()
 	}
 
 	_, err := coll.Upsert(bson.M{"_id": d.Id}, d)
@@ -33,3 +36,13 @@ func (d *Document) Save(s *mgo.Session) error {
 	}
 	return nil
 }
+
+func (d Document) Find(s *mgo.Session, name string, path string) (*Document, error) {
+	result := new(Document)
+	coll := d.Collection(s)
+
+	query := coll.Find(bson.M{"name": name, "path": path})
+	err := query.One(result)
+
+	return result, err
+}
diff --git a/document_test.go b/document_test.go
@@ -0,0 +1,30 @@
+package main
+
+import (
+	"testing"
+	"time"
+)
+
+func TestCreate(t *testing.T) {
+	s := MgoSession.Copy()
+	defer s.Close()
+
+	document := &Document{Name: "name", Path: "foo, bar, folder1", CreatedAt: time.Now()}
+	document.Save(s)
+
+	result, err := new(Document).Find(s, "name", "foo, bar, folder1")
+	if err != nil {
+		t.Fail()
+	}
+	if result.Name != "name" {
+		t.Fail()
+	}
+
+	result2, err := new(Document).Find(s, "name", "foo, bar")
+	if err == nil {
+		t.Fail()
+	}
+	if result2.Name == "name" {
+		t.Fail()
+	}
+}
diff --git a/handler.go b/handler.go
@@ -2,6 +2,8 @@ package main
 
 import (
 	"io"
+	"io/ioutil"
+	"labix.org/v2/mgo/bson"
 	"log"
 	"net/http"
 	"strings"
@@ -25,17 +27,26 @@ func (h *ImgHandler) handleGET(w http.ResponseWriter, req *http.Request) {
 }
 
 func (h *ImgHandler) handlePOST(w http.ResponseWriter, req *http.Request) {
-	h.createDocument(req)
+	h.upsertDocument(req)
 	io.WriteString(w, "Hello POST\n")
 }
 
-func (h *ImgHandler) createDocument(req *http.Request) {
+func (h *ImgHandler) upsertDocument(req *http.Request) {
 	s := MgoSession.Copy()
 	defer s.Close()
 
 	name, path := h.convertPath(req.URL.Path)
-	document := &Document{Name: name, Path: path}
-	err := document.Save(s)
+	document, _ := new(Document).Find(s, name, path)
+	document.Name = name
+	document.Path = path
+
+	data, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	document.Binary = bson.Binary{0x00, data}
+
+	err = document.Save(s)
 	if err != nil {
 		log.Fatalln(err)
 	}
diff --git a/handler_test.go b/handler_test.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestHandlePOST(t *testing.T) {
+	picture1, err := os.Open(filepath.Join(
+		os.Getenv("GOPATH"), "src", "github.com", "arkxu", "imgongo", "testdata", "picture1.png"))
+	if err != nil {
+		log.Panicln(err)
+	}
+
+	req, err := http.NewRequest("POST", "http://example.com/foo/sdf/sdflkj/abc.jpg", picture1)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	w := httptest.NewRecorder()
+
+	hander := &ImgHandler{}
+	hander.ServeHTTP(w, req)
+}
diff --git a/main.go b/main.go
@@ -26,6 +26,18 @@ type Config struct {
 }
 
 func main() {
+	// start the server
+	s := &http.Server{
+		Addr:         Configuration.Address,
+		Handler:      new(ImgHandler),
+		ReadTimeout:  Configuration.ReadTimeout * time.Second,
+		WriteTimeout: Configuration.WriteTimeout * time.Second,
+	}
+	log.Panicln(s.ListenAndServe())
+
+}
+
+func init() {
 	// read config file
 	configFile, err := os.Open(filepath.Join(
 		os.Getenv("GOPATH"), "src", "github.com", "arkxu", "imgongo", "config.json"))
@@ -41,14 +53,4 @@ func main() {
 	if err != nil {
 		log.Panicln(err)
 	}
-
-	// start the server
-	s := &http.Server{
-		Addr:         Configuration.Address,
-		Handler:      new(ImgHandler),
-		ReadTimeout:  Configuration.ReadTimeout * time.Second,
-		WriteTimeout: Configuration.WriteTimeout * time.Second,
-	}
-	log.Panicln(s.ListenAndServe())
-
 }
diff --git a/testdata/picture1.png b/testdata/picture1.png
