mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-21 21:35:28 +02:00
Code Issues Packages Projects Releases 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
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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{