github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve handling of remote image/jpeg resources (#9278)

Browse source 
Add jpe, jif, and jfif to image/jpeg extensions.
For remote image/jpeg without extension, always use jpg extension.

Closes #9275
This commit is contained in:
Joe Mooring 2021-12-12 23:55:15 -08:00 committed by GitHub
parent 8a005538db
commit a037be774d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/mediaType.go
View file

@ -177,7 +177,7 @@ var (
// Common image types
PNGType = newMediaType("image", "png", []string{"png"})
JPEGType = newMediaType("image", "jpeg", []string{"jpg", "jpeg"})
JPEGType = newMediaType("image", "jpeg", []string{"jpg", "jpeg", "jpe", "jif", "jfif"})
GIFType = newMediaType("image", "gif", []string{"gif"})
TIFFType = newMediaType("image", "tiff", []string{"tif", "tiff"})
BMPType = newMediaType("image", "bmp", []string{"bmp"})

3
resources/images/config.go
View file

@ -34,6 +34,9 @@ var (
imageFormats = map[string]Format{
".jpg": JPEG,
".jpeg": JPEG,
".jpe": JPEG,
".jif": JPEG,
".jfif": JPEG,
".png": PNG,
".tif": TIFF,
".tiff": TIFF,

22
resources/resource_factories/create/create.go
View file

@ -226,28 +226,30 @@ func (c *Client) FromRemote(uri string, options map[string]interface{}) (resourc
}
}
var contentType string
var extension string
if arr, _ := mime.ExtensionsByType(res.Header.Get("Content-Type")); len(arr) == 1 {
contentType = arr[0]
extension = arr[0]
}
// If content type was not determined by header, look for a file extention
if contentType == "" {
// If extension was not determined by header, look for a file extention
if extension == "" {
if ext := path.Ext(filename); ext != "" {
contentType = ext
extension = ext
}
}
// If content type was not determined by header or file extention, try using content itself
if contentType == "" {
// If extension was not determined by header or file extention, try using content itself
if extension == "" {
if ct := http.DetectContentType(body); ct != "application/octet-stream" {
if arr, _ := mime.ExtensionsByType(ct); arr != nil {
contentType = arr[0]
if ct == "image/jpeg" {
extension = ".jpg"
} else if arr, _ := mime.ExtensionsByType(ct); arr != nil {
extension = arr[0]
}
}
}
resourceID = filename[:len(filename)-len(path.Ext(filename))] + "_" + resourceID + contentType
resourceID = filename[:len(filename)-len(path.Ext(filename))] + "_" + resourceID + extension
return c.rs.New(
resources.ResourceSourceDescriptor{