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

http: download: adopt http.ServeContent

Browse Source
This commit is contained in:
Equim 2018-01-13 18:26:12 +08:00
parent 300b55f2c7
commit fe6bd4ce08
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
http/download.go
View File

@ -99,18 +99,12 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
} }
defer file.Close() defer file.Close()
w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"") w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(name))
_, err = io.Copy(w, file) _, err = io.Copy(w, file)
return 0, err return 0, err
} }
func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) { func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
if r.URL.Query().Get("inline") == "true" {
w.Header().Set("Content-Disposition", "inline")
} else {
w.Header().Set("Content-Disposition", `attachment; filename="`+c.File.Name+`"`)
}
file, err := os.Open(c.File.Path) file, err := os.Open(c.File.Path)
defer file.Close() defer file.Close()
@ -118,6 +112,9 @@ 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) _, err = io.Copy(w, file)
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
@ -125,3 +122,15 @@ func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request)
return 0, nil return 0, nil
} }
stat, err := file.Stat()
if err != nil {
return http.StatusInternalServerError, err
}
// As per RFC6266 section 4.3
w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(c.File.Name))
http.ServeContent(w, r, stat.Name(), stat.ModTime(), file)
return 0, nil
}