From c4c9530f33c9ddc7e82a24439770d92566e1c553 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 10 Jun 2016 22:18:44 +0100 Subject: [PATCH] updates; not working yet :( --- README.md | 1 + assets.go | 39 +++++ assets/{source => public/css}/styles.css | 0 assets/public/js/application.js | 0 assets/source/template.tmpl | 175 ----------------------- assets/templates/base.tmpl | 98 +++++++++++++ assets/templates/listing.tmpl | 79 ++++++++++ assets/assets.go => binary.go | 59 ++++++-- filemanager.go | 2 +- page.go | 36 +++++ setup.go | 27 +--- 11 files changed, 304 insertions(+), 212 deletions(-) create mode 100644 assets.go rename assets/{source => public/css}/styles.css (100%) create mode 100644 assets/public/js/application.js delete mode 100644 assets/source/template.tmpl create mode 100644 assets/templates/base.tmpl create mode 100644 assets/templates/listing.tmpl rename assets/assets.go => binary.go (75%) create mode 100644 page.go diff --git a/README.md b/README.md index b52dee0a..8fb96e24 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ ## Roadmap + [ ] Rename files ++ [ ] Upload files and drag & drop + [ ] Delete files + [ ] Show text files + [ ] Show pictures diff --git a/assets.go b/assets.go new file mode 100644 index 00000000..4ac96a80 --- /dev/null +++ b/assets.go @@ -0,0 +1,39 @@ +package filemanager + +import ( + "errors" + "mime" + "net/http" + "path/filepath" + "strings" +) + +// ServeAssets redirects the request for the respective method +func ServeAssets(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { + switch r.Method { + case "GET": + return serveAssetsGET(w, r, c) + default: + return http.StatusMethodNotAllowed, errors.New("Invalid method.") + } +} + +// serveAssetsGET provides the method for GET request on Assets page +func serveAssetsGET(w http.ResponseWriter, r *http.Request, c *Config) (int, error) { + // gets the filename to be used with Assets function + filename := strings.Replace(r.URL.Path, c.BaseURL+"/_filemanagerinternal", "public", 1) + file, err := Asset(filename) + if err != nil { + return 404, nil + } + + // Get the file extension ant its mime type + extension := filepath.Ext(filename) + mediatype := mime.TypeByExtension(extension) + + // Write the header with the Content-Type and write the file + // content to the buffer + w.Header().Set("Content-Type", mediatype) + w.Write(file) + return 200, nil +} diff --git a/assets/source/styles.css b/assets/public/css/styles.css similarity index 100% rename from assets/source/styles.css rename to assets/public/css/styles.css diff --git a/assets/public/js/application.js b/assets/public/js/application.js new file mode 100644 index 00000000..e69de29b diff --git a/assets/source/template.tmpl b/assets/source/template.tmpl deleted file mode 100644 index e24a428d..00000000 --- a/assets/source/template.tmpl +++ /dev/null @@ -1,175 +0,0 @@ - - - - {{.Name}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

- {{range $url, $name := .BreadcrumbMap}}{{$name}}{{if ne $url "/"}}/{{end}}{{end}} -

-
-
-
-
- {{.NumDirs}} director{{if eq 1 .NumDirs}}y{{else}}ies{{end}} - {{.NumFiles}} file{{if ne 1 .NumFiles}}s{{end}} - {{- if ne 0 .ItemsLimitedTo}} - (of which only {{.ItemsLimitedTo}} are displayed) - {{- end}} -
-
-
- - - - - - - - - - {{- if .CanGoUp}} - - - - - - {{- end}} - {{- range .Items}} - - - {{- if .IsDir}} - - {{- else}} - - {{- end}} - - - {{- end}} - -
- {{- if and (eq .Sort "name") (ne .Order "desc")}} - Name - {{- else if and (eq .Sort "name") (ne .Order "asc")}} - Name - {{- else}} - Name - {{- end}} - - {{- if and (eq .Sort "size") (ne .Order "desc")}} - Size - {{- else if and (eq .Sort "size") (ne .Order "asc")}} - Size - {{- else}} - Size - {{- end}} - - {{- if and (eq .Sort "time") (ne .Order "desc")}} - Modified - {{- else if and (eq .Sort "time") (ne .Order "asc")}} - Modified - {{- else}} - Modified - {{- end}} -
- - Go up - - ——
- - {{- if .IsDir}} - - {{- else}} - - {{- end}} - {{.Name}} - - —{{.HumanSize}}
-
-
- - - - diff --git a/assets/templates/base.tmpl b/assets/templates/base.tmpl new file mode 100644 index 00000000..f1aedcd1 --- /dev/null +++ b/assets/templates/base.tmpl @@ -0,0 +1,98 @@ + + + + {{.Name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ {{range $url, $name := .BreadcrumbMap}}{{$name}}{{if ne $url "/"}}/{{end}}{{end}} +

+
+
+ {{ template "content" .Listing }} +
+ + + + diff --git a/assets/templates/listing.tmpl b/assets/templates/listing.tmpl new file mode 100644 index 00000000..a647d7b2 --- /dev/null +++ b/assets/templates/listing.tmpl @@ -0,0 +1,79 @@ +{{ define "content" }} +
+
+ {{.NumDirs}} director{{if eq 1 .NumDirs}}y{{else}}ies{{end}} + {{.NumFiles}} file{{if ne 1 .NumFiles}}s{{end}} + {{- if ne 0 .ItemsLimitedTo}} + (of which only {{.ItemsLimitedTo}} are displayed) + {{- end}} +
+
+
+ + + + + + + + + + {{- if .CanGoUp}} + + + + + + {{- end}} + {{- range .Items}} + + + {{- if .IsDir}} + + {{- else}} + + {{- end}} + + + {{- end}} + +
+ {{- if and (eq .Sort "name") (ne .Order "desc")}} + Name + {{- else if and (eq .Sort "name") (ne .Order "asc")}} + Name + {{- else}} + Name + {{- end}} + + {{- if and (eq .Sort "size") (ne .Order "desc")}} + Size + {{- else if and (eq .Sort "size") (ne .Order "asc")}} + Size + {{- else}} + Size + {{- end}} + + {{- if and (eq .Sort "time") (ne .Order "desc")}} + Modified + {{- else if and (eq .Sort "time") (ne .Order "asc")}} + Modified + {{- else}} + Modified + {{- end}} +
+ + Go up + + ——
+ + {{- if .IsDir}} + + {{- else}} + + {{- end}} + {{.Name}} + + —{{.HumanSize}}
+
+{{ end }} diff --git a/assets/assets.go b/binary.go similarity index 75% rename from assets/assets.go rename to binary.go index a31823d6..7f75b73c 100644 --- a/assets/assets.go +++ b/binary.go @@ -1,10 +1,11 @@ // Code generated by go-bindata. // sources: -// assets/source/styles.css -// assets/source/template.tmpl +// assets/public/css/styles.css +// assets/public/js/application.js +// assets/templates/template.tmpl // DO NOT EDIT! -package assets +package filemanager import ( "fmt" @@ -28,10 +29,10 @@ type asset struct { info os.FileInfo } -// stylesCss reads file data from disk. It returns an error on failure. -func stylesCss() (*asset, error) { - path := "D:\\Code\\Go\\src\\github.com\\hacdias\\caddy-filemanager\\assets\\source\\styles.css" - name := "styles.css" +// publicCssStylesCss reads file data from disk. It returns an error on failure. +func publicCssStylesCss() (*asset, error) { + path := "D:\\Code\\Go\\src\\github.com\\hacdias\\caddy-filemanager\\assets\\public\\css\\styles.css" + name := "public/css/styles.css" bytes, err := bindataRead(path, name) if err != nil { return nil, err @@ -46,10 +47,28 @@ func stylesCss() (*asset, error) { return a, err } -// templateTmpl reads file data from disk. It returns an error on failure. -func templateTmpl() (*asset, error) { - path := "D:\\Code\\Go\\src\\github.com\\hacdias\\caddy-filemanager\\assets\\source\\template.tmpl" - name := "template.tmpl" +// publicJsApplicationJs reads file data from disk. It returns an error on failure. +func publicJsApplicationJs() (*asset, error) { + path := "D:\\Code\\Go\\src\\github.com\\hacdias\\caddy-filemanager\\assets\\public\\js\\application.js" + name := "public/js/application.js" + bytes, err := bindataRead(path, name) + if err != nil { + return nil, err + } + + fi, err := os.Stat(path) + if err != nil { + err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err) + } + + a := &asset{bytes: bytes, info: fi} + return a, err +} + +// templatesTemplateTmpl reads file data from disk. It returns an error on failure. +func templatesTemplateTmpl() (*asset, error) { + path := "D:\\Code\\Go\\src\\github.com\\hacdias\\caddy-filemanager\\assets\\templates\\template.tmpl" + name := "templates/template.tmpl" bytes, err := bindataRead(path, name) if err != nil { return nil, err @@ -116,8 +135,9 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "styles.css": stylesCss, - "template.tmpl": templateTmpl, + "public/css/styles.css": publicCssStylesCss, + "public/js/application.js": publicJsApplicationJs, + "templates/template.tmpl": templatesTemplateTmpl, } // AssetDir returns the file names below a certain @@ -160,8 +180,17 @@ type bintree struct { Children map[string]*bintree } var _bintree = &bintree{nil, map[string]*bintree{ - "styles.css": &bintree{stylesCss, map[string]*bintree{}}, - "template.tmpl": &bintree{templateTmpl, map[string]*bintree{}}, + "public": &bintree{nil, map[string]*bintree{ + "css": &bintree{nil, map[string]*bintree{ + "styles.css": &bintree{publicCssStylesCss, map[string]*bintree{}}, + }}, + "js": &bintree{nil, map[string]*bintree{ + "application.js": &bintree{publicJsApplicationJs, map[string]*bintree{}}, + }}, + }}, + "templates": &bintree{nil, map[string]*bintree{ + "template.tmpl": &bintree{templatesTemplateTmpl, map[string]*bintree{}}, + }}, }} // RestoreAsset restores an asset under the given directory diff --git a/filemanager.go b/filemanager.go index 32d629b0..ec87df3d 100644 --- a/filemanager.go +++ b/filemanager.go @@ -1,6 +1,6 @@ //go:generate go get github.com/jteeuwen/go-bindata //go:generate go install github.com/jteeuwen/go-bindata/go-bindata -//go:generate go-bindata -debug -pkg assets -prefix "assets/source" -o assets/assets.go assets/source/... +//go:generate go-bindata -debug -pkg filemanager -prefix "assets" -o binary.go assets/... // Package filemanager provides middleware for managing files in a directory // when directory path is requested instead of a specific file. Based on browse diff --git a/page.go b/page.go new file mode 100644 index 00000000..43b465da --- /dev/null +++ b/page.go @@ -0,0 +1,36 @@ +package filemanager + +import ( + "errors" + "net/http" +) + +// Page is the base type for each page +type Page struct { + GET, POST, PUT, DELETE func(w http.ResponseWriter, r *http.Request) (int, error) + DoGET, DoPOST, DoPUT, DoDELETE bool +} + +// Route redirects the request for the respective method +func (p Page) Route(w http.ResponseWriter, r *http.Request) (int, error) { + switch r.Method { + case "DELETE": + if p.DoDELETE { + return p.DELETE(w, r) + } + case "POST": + if p.DoPOST { + return p.POST(w, r) + } + case "GET": + if p.DoGET { + return p.GET(w, r) + } + case "PUT": + if p.DoPUT { + return p.PUT(w, r) + } + } + + return http.StatusMethodNotAllowed, errors.New("Invalid method.") +} diff --git a/setup.go b/setup.go index 94831db7..90656cc8 100644 --- a/setup.go +++ b/setup.go @@ -6,13 +6,10 @@ import ( "net/http" "text/template" - "github.com/hacdias/caddy-filemanager/assets" "github.com/mholt/caddy" "github.com/mholt/caddy/caddyhttp/httpserver" ) -const assetsURL = "/_filemanager_internal/" - func init() { caddy.RegisterPlugin("filemanager", caddy.Plugin{ ServerType: "http", @@ -23,7 +20,7 @@ func init() { // setup configures a new Browse middleware instance. func setup(c *caddy.Controller) error { // Second argument would be the template file to use - tplBytes, err := assets.Asset("template.tmpl") + tplBytes, err := Asset("templates/template.tmpl") if err != nil { return err } @@ -73,7 +70,6 @@ func fileManagerParse(c *caddy.Controller) ([]Config, error) { BaseURL: "/", StyleSheet: "", } - var styles string for c.NextBlock() { switch c.Val() { @@ -91,25 +87,14 @@ func fileManagerParse(c *caddy.Controller) ([]Config, error) { if !c.NextArg() { return configs, c.ArgErr() } - styles = c.Val() + tplBytes, err := ioutil.ReadFile(c.Val()) + if err != nil { + return configs, err + } + fmc.StyleSheet = string(tplBytes) } } - // Get StyleSheet - if styles != "" { - tplBytes, err := ioutil.ReadFile(c.Val()) - if err != nil { - return configs, err - } - fmc.StyleSheet = string(tplBytes) - } else { - tplBytes, err := assets.Asset("styles.css") - if err != nil { - return configs, err - } - fmc.StyleSheet = string(tplBytes) - } - fmc.Root = http.Dir(fmc.PathScope) // Save configuration