diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2018-05-05 14:12:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 14:12:51 -0700 |
| commit | 4d5e1e5947e3a515cb4a6010f7ac49e3a6ab52dc (patch) | |
| tree | f6c90bfa2bac3491cc853113e686a9c0da83d773 /weed/server | |
| parent | 94a35f25f35e992eab10beae124e76fcec21c3a1 (diff) | |
| parent | 7f49514f6fad19b70d955f8ad94fa7eae4e45edf (diff) | |
| download | seaweedfs-4d5e1e5947e3a515cb4a6010f7ac49e3a6ab52dc.tar.xz seaweedfs-4d5e1e5947e3a515cb4a6010f7ac49e3a6ab52dc.zip | |
Merge pull request #645 from chrislusf/vasto_filer
merge back filer related refactoring
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_api.go | 9 | ||||
| -rw-r--r-- | weed/server/filer_ui/templates.go | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/weed/server/filer_server_handlers_api.go b/weed/server/filer_server_handlers_api.go index f07aab88a..93a0dd751 100644 --- a/weed/server/filer_server_handlers_api.go +++ b/weed/server/filer_server_handlers_api.go @@ -21,6 +21,13 @@ func (fs *FilerServer) apiHandler(w http.ResponseWriter, r *http.Request) { writeJsonError(w, r, http.StatusInternalServerError, err) } switch apiRequest.Command { + case "lookupDirectoryEntry": + res := filer.LookupDirectoryEntryResult{} + res.Found, res.FileId, err = fs.filer.LookupDirectoryEntry(apiRequest.Directory, apiRequest.FileName) + if err != nil { + res.Error = err.Error() + } + writeJsonQuiet(w, r, http.StatusOK, res) case "listDirectories": res := filer.ListDirectoriesResult{} res.Directories, err = fs.filer.ListDirectories(apiRequest.Directory) @@ -30,7 +37,7 @@ func (fs *FilerServer) apiHandler(w http.ResponseWriter, r *http.Request) { writeJsonQuiet(w, r, http.StatusOK, res) case "listFiles": res := filer.ListFilesResult{} - res.Files, err = fs.filer.ListFiles(apiRequest.Directory, apiRequest.FileName, 100) + res.Files, err = fs.filer.ListFiles(apiRequest.Directory, apiRequest.FileName, 1000) if err != nil { res.Error = err.Error() } diff --git a/weed/server/filer_ui/templates.go b/weed/server/filer_ui/templates.go index 6f4f7ce86..b6a8a1878 100644 --- a/weed/server/filer_ui/templates.go +++ b/weed/server/filer_ui/templates.go @@ -28,15 +28,17 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html> {{$path := .Path }} {{ range $dirs_index, $dir := .Directories }} <li> - <a href= {{ print $path $dir.Name "/"}} > - {{ $dir.Name }} + <a href={{ print $path $dir "/"}} > + {{ $dir }} </a> </li> {{ end }} {{ range $file_index, $file := .Files }} <li> + <a href={{ print $path $file.Name}} > {{ $file.Name }} + </a> </li> {{ end }} </ul> |