Add jpeg support (mat#50)

besticon/besticon.go

@@ -22,6 +22,7 @@ import (
 
 	// Load supported image formats.
 	_ "image/gif"
+	_ "image/jpeg"
 	_ "image/png"
 
 	_ "github.com/mat/besticon/ico"
@@ -36,6 +37,7 @@ import (
 var defaultFormats []string
 
 const MinIconSize = 0
+
 // TODO: Turn into env var: https://github.com/rendomnet/besticon/commit/c85867cc80c00c898053ce8daf40d51a93b9d39f#diff-37b57e3fdbe4246771791e86deb4d69dL41
 const MaxIconSize = 500
 
@@ -222,9 +224,9 @@ func MainColorForIcons(icons []Icon) *color.RGBA {
 	}
 
 	var icon *Icon
-	// Prefer .png and .gif
+	// Prefer gif, jpg, png
 	for _, ico := range icons {
-		if ico.Format == "png" || ico.Format == "gif" {
+		if ico.Format == "gif" || ico.Format == "jpg" || ico.Format == "png" {
 			icon = &ico
 			break
 		}
@@ -293,6 +295,11 @@ func fetchIconDetails(url string) Icon {
 		return i
 	}
 
+	// jpeg => jpg
+	if format == "jpeg" {
+		format = "jpg"
+	}
+
 	i.Width = cfg.Width
 	i.Height = cfg.Height
 	i.Format = format
@@ -441,7 +448,7 @@ func init() {
 	setHTTPClient(&http.Client{Timeout: duration})
 
 	// Needs to be kept in sync with those image/... imports
-	defaultFormats = []string{"png", "gif", "ico"}
+	defaultFormats = []string{"gif", "ico", "jpg", "png"}
 }
 
 func setHTTPClient(c *http.Client) {

besticon/besticon_test.go

@@ -184,6 +184,19 @@ func TestRandomOrg(t *testing.T) {
 	assertEquals(t, expectedImage, actualImage)
 }
 
+func TestArchiveOrgWithJpg(t *testing.T) {
+	actualImages, _, err := fetchIconsWithVCR("archive.org.vcr", "https://archive.org")
+	assertEquals(t, nil, err)
+
+	expectedImages := []Icon{
+		{URL: "https://archive.org/apple-touch-icon-precomposed.png", Width: 180, Height: 180, Format: "png", Bytes: 5495, Sha1sum: "7b583a9eee7c4f705f2a93ddc50e6927bde4b634"},
+		{URL: "https://archive.org/apple-touch-icon.png", Width: 180, Height: 180, Format: "png", Bytes: 7494, Sha1sum: "093d651bf04e480e5c25167e780455c879c02447"},
+		{URL: "https://archive.org/images/glogo.jpg", Width: 40, Height: 40, Format: "jpg", Bytes: 3213, Sha1sum: "279fe766b791ae83a10765a8790a0928448a4e35"},
+		{URL: "https://archive.org/favicon.ico", Width: 32, Height: 32, Format: "ico", Bytes: 4286, Sha1sum: "b18786d77997511ab0f6e5c9d3c5b9e1bff164be"},
+	}
+	assertEquals(t, expectedImages, actualImages)
+}
+
 func TestParsingInexistentSite(t *testing.T) {
 	actualImages, _, err := fetchIconsWithVCR("not_existent.vcr", "http://wikipedia.org/does-not-exist")
 
@@ -210,8 +223,9 @@ func TestFindBestIconNoIcons(t *testing.T) {
 }
 
 func TestImageSizeDetection(t *testing.T) {
-	assertEquals(t, 1, getImageWidthForFile("testdata/pixel.png"))
 	assertEquals(t, 1, getImageWidthForFile("testdata/pixel.gif"))
+	assertEquals(t, 1, getImageWidthForFile("testdata/pixel.jpg"))
+	assertEquals(t, 1, getImageWidthForFile("testdata/pixel.png"))
 	assertEquals(t, 48, getImageWidthForFile("testdata/favicon.ico"))
 }
 

colorfinder/colorfinder.go

@@ -17,9 +17,11 @@ import (
 	"image/color"
 
 	// Load supported image formats
-	_ "github.com/mat/besticon/ico"
 	_ "image/gif"
+	_ "image/jpeg"
 	_ "image/png"
+
+	_ "github.com/mat/besticon/ico"
 )
 
 func main() {

colorfinder/colorfinder_test.go

@@ -20,8 +20,9 @@ func TestSimplePixel(t *testing.T) {
 }
 
 func TestImageFormats(t *testing.T) {
-	assertFindsRightColor(t, "white1x1.png", "ffffff")
 	assertFindsRightColor(t, "white1x1.gif", "ffffff")
+	assertFindsRightColor(t, "white1x1.jpg", "ffffff")
+	assertFindsRightColor(t, "white1x1.png", "ffffff")
 }
 
 func TestFindColors01(t *testing.T) {