refactor(type): simplify image type matching

metadata.go

@@ -68,7 +68,7 @@ func Metadata(buf []byte) (ImageMetadata, error) {
 		Alpha:       vipsHasAlpha(image),
 		Profile:     vipsHasProfile(image),
 		Space:       vipsSpace(image),
-		Type:        getImageTypeName(imageType),
+		Type:        ImageTypeName(imageType),
 	}
 
 	return metadata, nil

type.go

@@ -11,6 +11,15 @@ const (
 	MAGICK
 )
 
+// Pairs of image type and its name
+var ImageTypes = map[ImageType]string{
+	JPEG:   "jpeg",
+	PNG:    "png",
+	WEBP:   "webp",
+	TIFF:   "tiff",
+	MAGICK: "magick",
+}
+
 // Determines the image type format (jpeg, png, webp or tiff)
 func DetermineImageType(buf []byte) ImageType {
 	return vipsImageType(buf)
@@ -18,43 +27,28 @@ func DetermineImageType(buf []byte) ImageType {
 
 // Determines the image type format by name (jpeg, png, webp or tiff)
 func DetermineImageTypeName(buf []byte) string {
-	return getImageTypeName(vipsImageType(buf))
+	return ImageTypeName(vipsImageType(buf))
 }
 
 // Check if a given image type is supported
 func IsTypeSupported(t ImageType) bool {
-	return t == JPEG || t == PNG || t == WEBP || t == MAGICK
+	return ImageTypes[t] != ""
 }
 
 // Check if a given image type name is supported
 func IsTypeNameSupported(t string) bool {
-	return t == "jpeg" ||
+	for _, name := range ImageTypes {
-		t == "jpg" ||
+		if name == t {
-		t == "png" ||
+			return true
-		t == "webp" ||
+		}
-		t == "magick"
+	}
+	return false
 }
 
-func getImageTypeName(code ImageType) string {
+func ImageTypeName(t ImageType) string {
-	imageType := "unknown"
+	imageType := ImageTypes[t]
-
+	if imageType == "" {
-	switch {
+		return "unknown"
-	case code == JPEG:
-		imageType = "jpeg"
-		break
-	case code == WEBP:
-		imageType = "webp"
-		break
-	case code == PNG:
-		imageType = "png"
-		break
-	case code == TIFF:
-		imageType = "tiff"
-		break
-	case code == MAGICK:
-		imageType = "magick"
-		break
 	}
-
 	return imageType
 }

type_test.go

@@ -68,7 +68,7 @@ func TestIsTypeNameSupported(t *testing.T) {
 		name     string
 		expected bool
 	}{
-		{"jpg", true},
+		{"jpeg", true},
 		{"png", true},
 		{"webp", true},
 		{"gif", false},