Merge pull request #4 from Arimeka/fix-parse-exif

FIX: Don't fail when parse image without exif data

image.go

@@ -33,22 +33,16 @@ func (info *Info) ParseImage() error {
 		return err
 	}
 
-	x, err := exif.Decode(file)
-	if err != nil {
-		return err
-	}
-
 	info.Width = img.Width
 	info.Height = img.Height
 
-	if orientationTag, err := x.Get(exif.Orientation); err == nil {
-		switch orientationTag.String() {
-		case "5", "6", "7", "8":
-			info.Width = img.Height
-			info.Height = img.Width
-		default:
-			info.Width = img.Width
-			info.Height = img.Height
+	if x, err := exif.Decode(file); err == nil {
+		if orientationTag, err := x.Get(exif.Orientation); err == nil {
+			switch orientationTag.String() {
+			case "5", "6", "7", "8":
+				info.Width = img.Height
+				info.Height = img.Width
+			}
 		}
 	}
 

image_test.go

@@ -7,9 +7,11 @@ import (
 )
 
 const (
-	testImageValidImage          = "./fixtures/image.jpeg"
-	testImageWithExifOrientation = "./fixtures/left.jpg"
-	testImageInvalidImage        = "./fixtures/not-an-image.jpeg"
+	testImageValidImage           = "./fixtures/image.jpeg"
+	testImageWithExifOrientation  = "./fixtures/left.jpg"
+	testImageInvalidImage         = "./fixtures/not-an-image.jpeg"
+	testImageJPEGWithoutExifImage = "./fixtures/without-exif.jpg"
+	testImagePNGWithoutExifImage  = "./fixtures/without-exif.png"
 )
 
 func TestInfo_ParseImageNotFound(t *testing.T) {
@@ -51,3 +53,29 @@ func TestInfo_ParseImageWithOrientation(t *testing.T) {
 		t.Errorf("Filename: %s. Not expected width. Expected %d; got %d", testImageWithExifOrientation, 330, width)
 	}
 }
+
+func TestInfo_ParseImageJPEGWithoutExif(t *testing.T) {
+	info, _ := mediaprobe.New(testImageJPEGWithoutExifImage)
+	err := info.ParseImage()
+	if err != nil {
+		t.Errorf("Filename: %s. Unexpected error %v", testImageJPEGWithoutExifImage, err)
+	}
+
+	width := info.Width
+	if width != 200 {
+		t.Errorf("Filename: %s. Not expected width. Expected %d; got %d", testImageJPEGWithoutExifImage, 200, width)
+	}
+}
+
+func TestInfo_ParseImagePNGWithoutExif(t *testing.T) {
+	info, _ := mediaprobe.New(testImagePNGWithoutExifImage)
+	err := info.ParseImage()
+	if err != nil {
+		t.Errorf("Filename: %s. Unexpected error %v", testImagePNGWithoutExifImage, err)
+	}
+
+	width := info.Width
+	if width != 100 {
+		t.Errorf("Filename: %s. Not expected width. Expected %d; got %d", testImagePNGWithoutExifImage, 100, width)
+	}
+}