aboutsummaryrefslogtreecommitdiff
path: root/weed/shell/command_fs_ls.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-03-23 21:26:15 -0700
committerChris Lu <chris.lu@gmail.com>2020-03-23 21:26:15 -0700
commite666aeece2778812a4a9d3fc4daaaac86fe4a412 (patch)
treeb2554056e1398869fe3250af00bdd7f1fa3f6458 /weed/shell/command_fs_ls.go
parentd151185b7e5c7912afc38a36c163ef87eedcde3d (diff)
downloadseaweedfs-e666aeece2778812a4a9d3fc4daaaac86fe4a412.tar.xz
seaweedfs-e666aeece2778812a4a9d3fc4daaaac86fe4a412.zip
simplify parsing filer host and port
Diffstat (limited to 'weed/shell/command_fs_ls.go')
-rw-r--r--weed/shell/command_fs_ls.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/weed/shell/command_fs_ls.go b/weed/shell/command_fs_ls.go
index 66adf057e..be531e980 100644
--- a/weed/shell/command_fs_ls.go
+++ b/weed/shell/command_fs_ls.go
@@ -50,21 +50,19 @@ func (c *commandFsLs) Do(args []string, commandEnv *CommandEnv, writer io.Writer
}
}
- input := findInputDirectory(args)
-
- filerServer, filerPort, path, err := commandEnv.parseUrl(input)
+ path, err := commandEnv.parseUrl(findInputDirectory(args))
if err != nil {
return err
}
- if commandEnv.isDirectory(filerServer, filerPort, path) {
+ if commandEnv.isDirectory(path) {
path = path + "/"
}
dir, name := util.FullPath(path).DirAndName()
entryCount := 0
- err = filer_pb.ReadDirAllEntries(commandEnv.getFilerClient(filerServer, filerPort), util.FullPath(dir), name, func(entry *filer_pb.Entry, isLast bool) {
+ err = filer_pb.ReadDirAllEntries(commandEnv, util.FullPath(dir), name, func(entry *filer_pb.Entry, isLast bool) {
if !showHidden && strings.HasPrefix(entry.Name, ".") {
return