Merge pull request #727 from alexandrestein/weakClientFileName

Update download names file for weak clients
This commit is contained in:
Henrique Dias
2019-05-14 09:06:01 +01:00
committed by GitHub
2 changed files with 12 additions and 2 deletions

View File

@@ -2,6 +2,7 @@ package http
import (
"net/http"
"strings"
"github.com/filebrowser/filebrowser/v2/files"
)
@@ -10,7 +11,10 @@ var withHashFile = func(fn handleFunc) handleFunc {
return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
link, err := d.store.Share.GetByHash(r.URL.Path)
if err != nil {
return errToStatus(err), err
link, err = d.store.Share.GetByHash(ifPathWithName(r))
if err != nil {
return errToStatus(err), err
}
}
user, err := d.store.Users.Get(d.server.Root, link.UserID)
@@ -36,6 +40,12 @@ var withHashFile = func(fn handleFunc) handleFunc {
}
}
func ifPathWithName(r *http.Request) string {
pathElements := strings.Split(r.URL.Path, "/")
id := pathElements[len(pathElements)-2]
return id
}
var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
return renderJSON(w, r, d.raw)
})