diff options
| -rw-r--r-- | media/mediaType.go | 2 | ||||
| -rw-r--r-- | resources/images/config.go | 3 | ||||
| -rw-r--r-- | resources/resource_factories/create/create.go | 22 |
3 files changed, 16 insertions, 11 deletions
diff --git a/media/mediaType.go b/media/mediaType.go index f63d315d0..eec7a27a8 100644 --- a/media/mediaType.go +++ b/media/mediaType.go @@ -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"}) diff --git a/resources/images/config.go b/resources/images/config.go index 88790e3c4..c8990d5ca 100644 --- a/resources/images/config.go +++ b/resources/images/config.go @@ -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, diff --git a/resources/resource_factories/create/create.go b/resources/resource_factories/create/create.go index f7bde9ee6..64e2f95a6 100644 --- a/resources/resource_factories/create/create.go +++ b/resources/resource_factories/create/create.go @@ -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{ |