gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

shell: desupport filer url in the arguments

Browse source
This commit is contained in:
Chris Lu 2020-03-23 20:46:17 -07:00
parent 40601953bf
commit d151185b7e
7 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed/shell/command_fs_cat.go
View file

@ -25,7 +25,6 @@ func (c *commandFsCat) Help() string {
return `stream the file content on to the screen return `stream the file content on to the screen
fs.cat /dir/file_name fs.cat /dir/file_name
fs.cat http://<filer_server>:<port>/dir/file_name
` `
} }

6
weed/shell/command_fs_cd.go
View file

@ -16,14 +16,14 @@ func (c *commandFsCd) Name() string {
} }
func (c *commandFsCd) Help() string { func (c *commandFsCd) Help() string {
return `change directory to http://<filer_server>:<port>/dir/ return `change directory to a directory /path/to/dir
The full path can be too long to type. For example, The full path can be too long to type. For example,
fs.ls http://<filer_server>:<port>/some/path/to/file_name fs.ls /some/path/to/file_name
can be simplified as can be simplified as
fs.cd http://<filer_server>:<port>/some/path fs.cd /some/path
fs.ls to/file_name fs.ls to/file_name
` `
} }

6
weed/shell/command_fs_du.go
View file

@ -24,9 +24,9 @@ func (c *commandFsDu) Name() string {
func (c *commandFsDu) Help() string { func (c *commandFsDu) Help() string {
return `show disk usage return `show disk usage
fs.du http://<filer_server>:<port>/dir fs.du /dir
fs.du http://<filer_server>:<port>/dir/file_name fs.du /dir/file_name
fs.du http://<filer_server>:<port>/dir/file_prefix fs.du /dir/file_prefix
` `
} }

3
weed/shell/command_fs_ls.go
View file

@ -30,9 +30,6 @@ func (c *commandFsLs) Help() string {
fs.ls [-l] [-a] /dir/ fs.ls [-l] [-a] /dir/
fs.ls [-l] [-a] /dir/file_name fs.ls [-l] [-a] /dir/file_name
fs.ls [-l] [-a] /dir/file_prefix fs.ls [-l] [-a] /dir/file_prefix
fs.ls [-l] [-a] http://<filer_server>:<port>/dir/
fs.ls [-l] [-a] http://<filer_server>:<port>/dir/file_name
fs.ls [-l] [-a] http://<filer_server>:<port>/dir/file_prefix
` `
} }

2
weed/shell/command_fs_meta_cat.go
View file

@ -26,8 +26,6 @@ func (c *commandFsMetaCat) Help() string {
fs.meta.cat /dir/ fs.meta.cat /dir/
fs.meta.cat /dir/file_name fs.meta.cat /dir/file_name
fs.meta.cat http://<filer_server>:<port>/dir/
fs.meta.cat http://<filer_server>:<port>/dir/file_name
` `
} }

3
weed/shell/command_fs_tree.go
View file

@ -23,7 +23,8 @@ func (c *commandFsTree) Name() string {
func (c *commandFsTree) Help() string { func (c *commandFsTree) Help() string {
return `recursively list all files under a directory return `recursively list all files under a directory
fs.tree http://<filer_server>:<port>/dir/ fs.tree /some/dir
` `
} }

5
weed/shell/commands.go
View file

@ -50,7 +50,8 @@ func NewCommandEnv(options ShellOptions) *CommandEnv {
func (ce *CommandEnv) parseUrl(input string) (filerServer string, filerPort int64, path string, err error) { func (ce *CommandEnv) parseUrl(input string) (filerServer string, filerPort int64, path string, err error) {
if strings.HasPrefix(input, "http") { if strings.HasPrefix(input, "http") {
return parseFilerUrl(input) err = fmt.Errorf("http://<filer>:<port> prefix is not supported any more")
return
} }
if !strings.HasPrefix(input, "/") { if !strings.HasPrefix(input, "/") {
input = filepath.ToSlash(filepath.Join(ce.option.Directory, input)) input = filepath.ToSlash(filepath.Join(ce.option.Directory, input))
@ -101,7 +102,7 @@ func parseFilerUrl(entryPath string) (filerServer string, filerPort int64, path
} }
path = u.Path path = u.Path
} else { } else {
err = fmt.Errorf("path should have full url http://<filer_server>:<port>/path/to/dirOrFile : %s", entryPath) err = fmt.Errorf("path should have full url /path/to/dirOrFile : %s", entryPath)
} }
return return
} }