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

http: download: deprecate unnecessary temp dir

Browse Source
This commit is contained in:
Equim 2018-01-13 18:40:20 +08:00
parent fe6bd4ce08
commit fdef8afde5
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
http/download.go
View File

@ -2,7 +2,6 @@ package http
import ( import (
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -45,62 +44,37 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
files = append(files, c.File.Path) files = append(files, c.File.Path)
} }
// If the format is true, just set it to "zip".
if query == "true" || query == "" {
query = "zip"
}
var ( var (
extension string extension string
temp string ar archiver.Archiver
err error
tempfile string
) )
// Create a temporary directory.
temp, err = ioutil.TempDir("", "")
if err != nil {
return http.StatusInternalServerError, err
}
defer os.RemoveAll(temp)
tempfile = filepath.Join(temp, "temp")
switch query { switch query {
case "zip": // If the format is true, just set it to "zip".
extension, err = ".zip", archiver.Zip.Make(tempfile, files) case "zip", "true", "":
extension, ar = ".zip", archiver.Zip
case "tar": case "tar":
extension, err = ".tar", archiver.Tar.Make(tempfile, files) extension, ar = ".tar", archiver.Tar
case "targz": case "targz":
extension, err = ".tar.gz", archiver.TarGz.Make(tempfile, files) extension, ar = ".tar.gz", archiver.TarGz
case "tarbz2": case "tarbz2":
extension, err = ".tar.bz2", archiver.TarBz2.Make(tempfile, files) extension, ar = ".tar.bz2", archiver.TarBz2
case "tarxz": case "tarxz":
extension, err = ".tar.xz", archiver.TarXZ.Make(tempfile, files) extension, ar = ".tar.xz", archiver.TarXZ
default: default:
return http.StatusNotImplemented, nil return http.StatusNotImplemented, nil
} }
if err != nil {
return http.StatusInternalServerError, err
}
// Defines the file name. // Defines the file name.
name := c.File.Name name := c.File.Name
if name == "." || name == "" { if name == "." || name == "" {
name = "download" name = "archive"
} }
name += extension name += extension
// Opens the file so it can be downloaded.
file, err := os.Open(temp + "/temp")
if err != nil {
return http.StatusInternalServerError, err
}
defer file.Close()
w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(name)) w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(name))
_, err = io.Copy(w, file) err := ar.Write(w, files)
return 0, err return 0, err
} }