go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-01-23 11:14:48 +02:00
Code Releases Activity

Better Content-Type detection for FS transport

Browse Source
This commit is contained in:
DarthSim 2022-10-03 15:57:19 +06:00
parent e233a60f6c
commit 72ec0f3c68
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
transport/fs/fs.go
View File

@ -49,8 +49,10 @@ func (t transport) RoundTrip(req *http.Request) (resp *http.Response, err error)
size := fi.Size()
body := io.ReadCloser(f)
mime := mime.TypeByExtension(filepath.Ext(fi.Name()))
header.Set("Content-Type", mime)
if mimetype := detectContentType(f, fi); len(mimetype) > 0 {
header.Set("Content-Type", mimetype)
}
f.Seek(0, io.SeekStart)
start, end, err := httprange.Parse(req.Header.Get("Range"))
switch {
@ -126,3 +128,22 @@ func respNotFound(req *http.Request, msg string) *http.Response {
Request: req,
}
}
func detectContentType(f http.File, fi fs.FileInfo) string {
var (
tmp [512]byte
mimetype string
)
if n, err := io.ReadFull(f, tmp[:]); err == nil {
mimetype = http.DetectContentType(tmp[:n])
}
if len(mimetype) == 0 || strings.HasPrefix(mimetype, "text/plain") || strings.HasPrefix(mimetype, "application/octet-stream") {
if m := mime.TypeByExtension(filepath.Ext(fi.Name())); len(m) > 0 {
mimetype = m
}
}
return mimetype
}