From c63cebaee11b03c44ead1d4563c22329ffd99220 Mon Sep 17 00:00:00 2001 From: cschiano Date: Mon, 18 Jul 2016 10:28:24 +0200 Subject: [PATCH 1/2] Add a visualization for the filer --- weed/server/filer_server_handlers_read.go | 74 ++++++----------------- weed/server/filer_ui/templates.go | 53 ++++++++++++++++ 2 files changed, 72 insertions(+), 55 deletions(-) create mode 100644 weed/server/filer_ui/templates.go diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 8340021ce..1470bcc48 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -1,15 +1,12 @@ package weed_server import ( - "io" "net/http" - "net/url" "strconv" "strings" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/operation" - "github.com/chrislusf/seaweedfs/weed/util" + ui "github.com/chrislusf/seaweedfs/weed/server/filer_ui" "github.com/syndtr/goleveldb/leveldb" ) @@ -42,63 +39,30 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque } func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) { - if strings.HasSuffix(r.URL.Path, "/") { - if fs.disableDirListing { - w.WriteHeader(http.StatusMethodNotAllowed) - return - } - fs.listDirectoryHandler(w, r) - return - } + fileLimit := 100 + files, err := fs.filer.ListFiles(r.URL.Path, "", fileLimit) - fileId, err := fs.filer.FindFile(r.URL.Path) if err == leveldb.ErrNotFound { - glog.V(3).Infoln("Not found in db", r.URL.Path) - w.WriteHeader(http.StatusNotFound) + glog.V(0).Infof("Error %s", err) return } - urlLocation, err := operation.LookupFileId(fs.getMasterNode(), fileId) - if err != nil { - glog.V(1).Infoln("operation LookupFileId %s failed, err is %s", fileId, err.Error()) - w.WriteHeader(http.StatusNotFound) + directories, err2 := fs.filer.ListDirectories(r.URL.Path) + if err2 == leveldb.ErrNotFound { + glog.V(0).Infof("Error %s", err) return } - urlString := urlLocation - if fs.redirectOnRead { - http.Redirect(w, r, urlString, http.StatusFound) - return + + args := struct { + Path string + Files interface{} + Directories interface{} + NotAllFilesDisplayed bool + }{ + r.URL.Path, + files, + directories, + len(files) == fileLimit, } - u, _ := url.Parse(urlString) - q := u.Query() - for key, values := range r.URL.Query() { - for _, value := range values { - q.Add(key, value) - } - } - u.RawQuery = q.Encode() - request := &http.Request{ - Method: r.Method, - URL: u, - Proto: r.Proto, - ProtoMajor: r.ProtoMajor, - ProtoMinor: r.ProtoMinor, - Header: r.Header, - Body: r.Body, - Host: r.Host, - ContentLength: r.ContentLength, - } - glog.V(3).Infoln("retrieving from", u) - resp, do_err := util.Do(request) - if do_err != nil { - glog.V(0).Infoln("failing to connect to volume server", do_err.Error()) - writeJsonError(w, r, http.StatusInternalServerError, do_err) - return - } - defer resp.Body.Close() - for k, v := range resp.Header { - w.Header()[k] = v - } - w.WriteHeader(resp.StatusCode) - io.Copy(w, resp.Body) + ui.StatusTpl.Execute(w, args) } diff --git a/weed/server/filer_ui/templates.go b/weed/server/filer_ui/templates.go new file mode 100644 index 000000000..b4d16d4db --- /dev/null +++ b/weed/server/filer_ui/templates.go @@ -0,0 +1,53 @@ +package master_ui + +import ( + "html/template" +) + +var StatusTpl = template.Must(template.New("status").Parse(` + + + SeaweedFS Filer + + + + +
+
+

+ + SeaweedFS Filer +

+
+
+ {{.Path}} +
+ +
+
    + {{$path := .Path }} + {{ range $dirs_index, $dir := .Directories }} +
  • + + {{ $dir.Name }} + +
    • + {{ end }} + + {{ range $file_index, $file := .Files }} +
  • + {{ $file.Name }} +
    • + {{ end }} +
+
+ + {{if .NotAllFilesDisplayed}} +
+ Not all files are displayed. +
+ {{end}} +
+ + +`)) From af905a3ff719118bdde900f4c1387f738fbb83dd Mon Sep 17 00:00:00 2001 From: cschiano Date: Wed, 20 Jul 2016 10:46:28 +0200 Subject: [PATCH 2/2] Add limit parameter and pagination for files --- weed/server/filer_server_handlers_read.go | 59 +++++++++++++---------- weed/server/filer_ui/templates.go | 6 ++- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 1470bcc48..98ec13f95 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -10,59 +10,66 @@ import ( "github.com/syndtr/goleveldb/leveldb" ) -// listDirectoryHandler lists directories and folers under a directory -// files are sorted by name and paginated via "lastFileName" and "limit". -// sub directories are listed on the first page, when "lastFileName" -// is empty. -func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Request) { +func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) { if !strings.HasSuffix(r.URL.Path, "/") { return } - dirlist, err := fs.filer.ListDirectories(r.URL.Path) - if err == leveldb.ErrNotFound { - glog.V(3).Infoln("Directory Not Found in db", r.URL.Path) - w.WriteHeader(http.StatusNotFound) + + if fs.disableDirListing { + w.WriteHeader(http.StatusMethodNotAllowed) return } - m := make(map[string]interface{}) - m["Directory"] = r.URL.Path - lastFileName := r.FormValue("lastFileName") - if lastFileName == "" { - m["Subdirectories"] = dirlist - } + limit, limit_err := strconv.Atoi(r.FormValue("limit")) if limit_err != nil { limit = 100 } - m["Files"], _ = fs.filer.ListFiles(r.URL.Path, lastFileName, limit) - writeJsonQuiet(w, r, http.StatusOK, m) -} -func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) { - fileLimit := 100 - files, err := fs.filer.ListFiles(r.URL.Path, "", fileLimit) + lastFileName := r.FormValue("lastFileName") + files, err := fs.filer.ListFiles(r.URL.Path, lastFileName, limit) if err == leveldb.ErrNotFound { glog.V(0).Infof("Error %s", err) + w.WriteHeader(http.StatusNotFound) return } directories, err2 := fs.filer.ListDirectories(r.URL.Path) if err2 == leveldb.ErrNotFound { glog.V(0).Infof("Error %s", err) + w.WriteHeader(http.StatusNotFound) return } + shouldDisplayLoadMore := len(files) > 0 + + lastFileName = "" + if len(files) > 0 { + lastFileName = files[len(files)-1].Name + + files2, err3 := fs.filer.ListFiles(r.URL.Path, lastFileName, limit) + if err3 == leveldb.ErrNotFound { + glog.V(0).Infof("Error %s", err) + w.WriteHeader(http.StatusNotFound) + return + } + shouldDisplayLoadMore = len(files2) > 0 + } + args := struct { - Path string - Files interface{} - Directories interface{} - NotAllFilesDisplayed bool + Path string + Files interface{} + Directories interface{} + Limit int + LastFileName string + ShouldDisplayLoadMore bool }{ r.URL.Path, files, directories, - len(files) == fileLimit, + limit, + lastFileName, + shouldDisplayLoadMore, } ui.StatusTpl.Execute(w, args) } diff --git a/weed/server/filer_ui/templates.go b/weed/server/filer_ui/templates.go index b4d16d4db..6f4f7ce86 100644 --- a/weed/server/filer_ui/templates.go +++ b/weed/server/filer_ui/templates.go @@ -42,9 +42,11 @@ var StatusTpl = template.Must(template.New("status").Parse(` - {{if .NotAllFilesDisplayed}} +{{if .ShouldDisplayLoadMore}}
- Not all files are displayed. +