Implemented better images.Get() and added better tests

images/files.go

@@ -7,7 +7,6 @@ import (
 	"image/jpeg"
 	"image/png"
 	"io"
-	"net/http"
 	"os"
 
 	"golang.org/x/image/webp"
@@ -20,27 +19,45 @@ func Get(fileName string) (image.Image, error) {
 	}
 	defer file.Close()
 
-	fb := make([]byte, 12)
+	fb, err := prepareFileForDecode(file)
-	file.Read(fb)
+	if err != nil {
-	ft := GetFileType(fb)
+		return nil, err
-	if ft == UNKNOWN {
-		return nil, errors.New("unsupported file type")
 	}
 
-	var img image.Image
+	return decodeImageData(fb, file)
-	switch ft {
+}
+
+func prepareFileForDecode(file *os.File) ([]byte, error) {
+	// Read the first 14 bytes, used for performing image type checks before parsing the image data
+	fb := make([]byte, 14)
+	_, err := file.Read(fb)
+	if err != nil {
+		return nil, err
+	}
+
+	// Reset the read cursor
+	_, err = file.Seek(0, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	return fb, nil
+}
+
+func decodeImageData(buf []byte, r io.Reader) (img image.Image, err error) {
+	switch GetFileType(buf) {
 	case JPEG:
-		img, err = jpeg.Decode(file)
+		img, err = jpeg.Decode(r)
-		break
 	case PNG:
-		img, err = png.Decode(file)
+		img, err = png.Decode(r)
-		break
 	case GIF:
-		img, err = gif.Decode(file)
+		img, err = gif.Decode(r)
-		break
 	case WEBP:
-		img, err = webp.Decode(file)
+		img, err = webp.Decode(r)
-		break
+	case UNKNOWN:
+		fallthrough
+	default:
+		return nil, errors.New("unsupported file type")
 	}
 	if err != nil {
 		return nil, err

images/files_test.go

@@ -0,0 +1,79 @@
+package images
+
+import (
+	"github.com/stretchr/testify/require"
+	"image"
+	"testing"
+)
+
+func TestGet(t *testing.T) {
+
+	cs := []struct{
+		Filepath string
+		Error bool
+		Nil bool
+		Bounds image.Rectangle
+	}{
+		{
+			"../_assets/tests/elephant.jpg",
+			false,
+			false,
+			image.Rectangle{
+				Min: image.Point{X: 0, Y: 0},
+				Max: image.Point{X: 80, Y: 80},
+			},
+		},
+		{
+			"../_assets/tests/status.png",
+			false,
+			false,
+			image.Rectangle{
+				Min: image.Point{X: 0, Y: 0},
+				Max: image.Point{X: 256, Y: 256},
+			},
+		},
+		{
+			"../_assets/tests/spin.gif",
+			false,
+			false,
+			image.Rectangle{
+				Min: image.Point{X: 0, Y: 0},
+				Max: image.Point{X: 256, Y: 256},
+			},
+		},
+		{
+			"../_assets/tests/rose.webp",
+			false,
+			false,
+			image.Rectangle{
+				Min: image.Point{X: 0, Y: 0},
+				Max: image.Point{X: 400, Y: 301},
+			},
+		},
+		{
+			"../_assets/tests/test.aac",
+			true,
+			true,
+			image.Rectangle{},
+		},
+	}
+
+	for _, test := range cs {
+		img, err := Get(test.Filepath)
+
+		if test.Error {
+			require.Error(t, err)
+		} else {
+			require.NoError(t, err)
+		}
+
+		if test.Nil {
+			require.Nil(t, img)
+			continue
+		} else {
+			require.NotNil(t, img)
+		}
+
+		require.Exactly(t, test.Bounds, img.Bounds())
+	}
+}