nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: download: adopt http.ServeContent in inline mode

Browse Source
This commit is contained in:
Equim 2018-01-13 18:45:55 +08:00
parent fdef8afde5
commit 181ff7b0b1
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http/download.go
View File

@ -1,7 +1,6 @@
package http package http
import ( import (
"io"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -86,24 +85,18 @@ func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request)
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
if r.URL.Query().Get("inline") == "true" {
w.Header().Set("Content-Disposition", "inline")
_, err = io.Copy(w, file)
if err != nil {
return http.StatusInternalServerError, err
}
return 0, nil
}
stat, err := file.Stat() stat, err := file.Stat()
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
if r.URL.Query().Get("inline") == "true" {
w.Header().Set("Content-Disposition", "inline")
} else {
// As per RFC6266 section 4.3 // As per RFC6266 section 4.3
w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(c.File.Name)) w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(c.File.Name))
}
http.ServeContent(w, r, stat.Name(), stat.ModTime(), file) http.ServeContent(w, r, stat.Name(), stat.ModTime(), file)
return 0, nil return 0, nil