Compare commits

...
5 Commits
Author SHA1 Message Date
Henrique Dias 23a2c60d9f chore: version 1.4.5
Former-commit-id: c1c687c85477814782ac1c37f1153222cbd66aac [formerly 62f611d73f4a94b1a8c38be469edbe4b9f15b128] [formerly b18279cba8d103941a0c999e212fba4b4c36d1f1 [formerly e1836e2274]]
Former-commit-id: e735874c31bd3f07fefcc528e63e83520b1ccf8a [formerly 121a4fd4096b00d3a03df57bb6872f02cca94a47]
Former-commit-id: 79f9ba3aff8aab04125277fc8298aaf3416d3648
2018-01-14 10:28:02 +00:00
EquimandHenrique Dias 54e66bbc05 http: download: improvement for range support and I/O (#330)
* http: download: adopt http.ServeContent

* http: download: deprecate unnecessary temp dir

* http: download: adopt http.ServeContent in inline mode


Former-commit-id: 9ad519b51bcd7bebd862ccb65153bf418aaccc24 [formerly 6c2ac9b647a5cd5a67b7f688502e185a6180a34d] [formerly fd8dab4db58c098dcd5fca47226a50fa99a52aeb [formerly 30efa23a85]]
Former-commit-id: 54cd985769d20c02f890ffaa64ed02153b9fcff9 [formerly 7f0bf159ebf192055fa2bc346a0545d0b3007721]
Former-commit-id: 58e72dbdd1dc8ae43f4d769632d892ace0a19400
2018-01-14 08:41:01 +00:00
EquimandHenrique Dias 69b262f91a fix(i18n): zh: minor fix (#329)
Former-commit-id: f923123d02d6aa875bc5c3a0171920df625b1787 [formerly 494e0f97f54b823fb14ed5b4ac028942dbf0077c] [formerly 933be3dd0a5b167e822d73a4877c1ebfb55ae4c0 [formerly 94648c92a2]]
Former-commit-id: e01ef36d8dbcee0ce16ea190b2d9afe6a9751c20 [formerly 59ca3451e6b26e9ad2811ba7c352778e8acec1ec]
Former-commit-id: 799fda14369c565d68c62133b7cd62ea7f1e75e9
2018-01-13 09:49:47 +00:00
Henrique DiasandGitHub 731cc45e05 Update README.md
Former-commit-id: 3c5dc2c840b4ea82d2b88503b89515d8d6e1b590 [formerly aa5a9564be7917bc2bca82870eb61ccc2cc75347] [formerly f8f01920e7b54e52b012f469d917fb6f7e94d94a [formerly 300b55f2c7]]
Former-commit-id: daae1ff5c473b6fa583e270538830a046831eb2c [formerly 73ef7dac5d799cb3e321ba1b4969b125aa71c52b]
Former-commit-id: 715ce711701440e20da9512272fcd31922435323
2018-01-09 07:30:42 +00:00
Henrique Dias a3960ff9a3 chore: setting untracked version [ci skip]
Former-commit-id: 9301c7f3b4a71d6ce1e41e48bb8b61a0f4878f44 [formerly 6e69aa23419cd7e42e474c7db9f1cb6dbe5955d9] [formerly 19b578c58faf698f3bfceaeae33cc085801b5d9d [formerly f2ac4dd262]]
Former-commit-id: ca520cd8264c71fb6cf0f0bfd88c065d8c55c08e [formerly 83d060fa29de8b601f40acac64857044f352a141]
Former-commit-id: 38ac4f4fc95e531027b5daa737987bfecccbd244
2018-01-07 12:40:42 +00:00
6 changed files with 25 additions and 53 deletions
-4
View File
@@ -73,7 +73,3 @@ this are keywords case:insensitive
# Contributing
The contributing guidelines can be found [here](https://github.com/hacdias/filemanager/blob/master/CONTRIBUTING.md).
# Donate
Enjoying this project? You can [donate to its creator](https://henriquedias.com/donate/). He will appreciate.
+1 -1
View File
@@ -134,7 +134,7 @@ settings:
您可以将该用户设置为管理员,也可以单独选择各项权限。\
如果选择了“管理员”,则其他的选项会被自动勾上,\
同时该用户可以管理其他用户。"
profileSettings: 配置文件设置
profileSettings: 个人设置
ruleExample1: "\
阻止用户访问所有文件夹下任何以 . 开头的文件\
(隐藏文件, 例如: .git, .gitignore)。"
+1 -1
View File
@@ -134,7 +134,7 @@ settings:
您可以將該使用者設置為管理員,也可以單獨選擇各項權限。\
如果選擇了“管理員”,則其他的選項會被自動勾上,\
同時該使用者可以管理其他使用者。"
profileSettings: 設定檔設定
profileSettings: 個人設定
ruleExample1: "\
封鎖使用者存取所有資料夾下任何以 . 開頭的檔案\
(隱藏文件, 例如: .git, .gitignore)。"
+1 -1
View File
@@ -23,7 +23,7 @@ import (
const (
// Version is the current File Manager version.
Version = "1.4.4"
Version = "1.4.5"
ListViewMode = "list"
MosaicViewMode = "mosaic"
+21 -45
View File
@@ -1,8 +1,6 @@
package http
import (
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -45,72 +43,41 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
files = append(files, c.File.Path)
}
// If the format is true, just set it to "zip".
if query == "true" || query == "" {
query = "zip"
}
var (
extension string
temp string
err error
tempfile string
ar archiver.Archiver
)
// 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 {
case "zip":
extension, err = ".zip", archiver.Zip.Make(tempfile, files)
// If the format is true, just set it to "zip".
case "zip", "true", "":
extension, ar = ".zip", archiver.Zip
case "tar":
extension, err = ".tar", archiver.Tar.Make(tempfile, files)
extension, ar = ".tar", archiver.Tar
case "targz":
extension, err = ".tar.gz", archiver.TarGz.Make(tempfile, files)
extension, ar = ".tar.gz", archiver.TarGz
case "tarbz2":
extension, err = ".tar.bz2", archiver.TarBz2.Make(tempfile, files)
extension, ar = ".tar.bz2", archiver.TarBz2
case "tarxz":
extension, err = ".tar.xz", archiver.TarXZ.Make(tempfile, files)
extension, ar = ".tar.xz", archiver.TarXZ
default:
return http.StatusNotImplemented, nil
}
if err != nil {
return http.StatusInternalServerError, err
}
// Defines the file name.
name := c.File.Name
if name == "." || name == "" {
name = "download"
name = "archive"
}
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))
err := ar.Write(w, files)
w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"")
_, err = io.Copy(w, file)
return 0, err
}
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)
defer file.Close()
@@ -118,10 +85,19 @@ func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request)
return http.StatusInternalServerError, err
}
_, err = io.Copy(w, file)
stat, err := file.Stat()
if err != nil {
return http.StatusInternalServerError, err
}
if r.URL.Query().Get("inline") == "true" {
w.Header().Set("Content-Disposition", "inline")
} else {
// 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
}
+1 -1
View File
@@ -1 +1 @@
2ba96e4a87cf7fcd056a9d72052623c5286ec7f1
0333464bb0a238393150731bc833fa4aa3b7ec60