mirror of
https://github.com/gmemstr/sliproad.git
synced 2024-09-20 00:21:15 +01:00
59c79fc4fe
Previously, spaces or other special characters in filenames were borked because of how the filenames were passed through to the ViewFile function - with escaped strings (%020 instead of " "). Added a QueryUnescape call, and slightly tweaked the router to use a filename rather than accessing var everytime.
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
package router
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"github.com/gmemstr/nas/files"
|
|
"github.com/gorilla/mux"
|
|
"net/http"
|
|
"net/url"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
func HandleProvider() Handler {
|
|
return func(context *Context, w http.ResponseWriter, r *http.Request) *HTTPError {
|
|
vars := mux.Vars(r)
|
|
providerCodename := vars["provider"]
|
|
providerCodename = strings.Replace(providerCodename, "/", "", -1)
|
|
provider := *files.Providers[providerCodename]
|
|
|
|
if r.Method == "GET" {
|
|
fileList := provider.GetDirectory("")
|
|
if vars["file"] != "" {
|
|
filename, err := url.QueryUnescape(vars["file"])
|
|
if err != nil {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error determining filetype for %s\n", filename),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
fileType := provider.DetermineType(filename)
|
|
if fileType == "" {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error determining filetype for %s\n", filename),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
if fileType == "file" {
|
|
provider.ViewFile(filename, w)
|
|
return nil
|
|
}
|
|
fileList = provider.GetDirectory(filename)
|
|
}
|
|
data, err := json.Marshal(fileList)
|
|
if err != nil {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error fetching filelisting for %s\n", vars["file"]),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
w.Write(data)
|
|
}
|
|
|
|
if r.Method == "POST" {
|
|
err := r.ParseMultipartForm(32 << 20)
|
|
if err != nil {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error parsing form for %s\n", vars["file"]),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
file, handler, err := r.FormFile("file")
|
|
defer file.Close()
|
|
|
|
success := provider.SaveFile(file, handler.Filename, vars["file"])
|
|
if !success {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error saving file %s\n", vars["file"]),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
w.Write([]byte("saved file"))
|
|
}
|
|
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func ListProviders() Handler {
|
|
return func(context *Context, w http.ResponseWriter, r *http.Request) *HTTPError {
|
|
var providers []string
|
|
for v, _ := range files.ProviderConfig {
|
|
providers = append(providers, v)
|
|
}
|
|
sort.Strings(providers)
|
|
data, err := json.Marshal(providers)
|
|
if err != nil {
|
|
return &HTTPError{
|
|
Message: fmt.Sprintf("error provider listing"),
|
|
StatusCode: http.StatusInternalServerError,
|
|
}
|
|
}
|
|
w.Write(data)
|
|
return nil
|
|
}
|
|
}
|