refactor(type)

resize_test.go

@@ -2,7 +2,6 @@ package bimg
 
 import (
 	"io/ioutil"
-	"net/http"
 	"os"
 	"testing"
 )
@@ -25,9 +24,7 @@ func TestResize(t *testing.T) {
 		t.Errorf("Resize(imgData, %#v) error: %#v", options, err)
 	}
 
-	debug("Image %s", http.DetectContentType(newImg))
-
-	if http.DetectContentType(newImg) != "image/jpeg" {
+	if DetermineType(newImg) != JPEG {
 		t.Fatal("Image is not jpeg")
 	}
 

type.go

@@ -9,11 +9,6 @@ const (
 	MAGICK  = "magick"
 )
 
-type Type struct {
-	Name string
-	Mime string
-}
-
-func DetermineType(buf []byte) *Type {
-	return &Type{Name: "jpg", Mime: "image/jpg"}
+func DetermineType(buf []byte) string {
+	return vipsImageType(buf)
 }

vips.go

@@ -87,10 +87,6 @@ func vipsExtract(image *C.struct__VipsImage, left int, top int, width int, heigh
 	return buf, nil
 }
 
-type vipsSaveOptions struct {
-	Quality int
-}
-
 func vipsImageType(buf []byte) string {
 	imageType := UNKNOWN
 
@@ -119,6 +115,10 @@ func vipsImageType(buf []byte) string {
 	return imageType
 }
 
+type vipsSaveOptions struct {
+	Quality int
+}
+
 func vipsSave(image *C.struct__VipsImage, o vipsSaveOptions) ([]byte, error) {
 	var ptr unsafe.Pointer
 	length := C.size_t(0)