mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
shell: desupport filer url in the arguments
This commit is contained in:
parent
40601953bf
commit
d151185b7e
|
@ -25,7 +25,6 @@ func (c *commandFsCat) Help() string {
|
|||
return `stream the file content on to the screen
|
||||
|
||||
fs.cat /dir/file_name
|
||||
fs.cat http://<filer_server>:<port>/dir/file_name
|
||||
`
|
||||
}
|
||||
|
||||
|
|
|
@ -16,14 +16,14 @@ func (c *commandFsCd) Name() 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,
|
||||
fs.ls http://<filer_server>:<port>/some/path/to/file_name
|
||||
fs.ls /some/path/to/file_name
|
||||
|
||||
can be simplified as
|
||||
|
||||
fs.cd http://<filer_server>:<port>/some/path
|
||||
fs.cd /some/path
|
||||
fs.ls to/file_name
|
||||
`
|
||||
}
|
||||
|
|
|
@ -24,9 +24,9 @@ func (c *commandFsDu) Name() string {
|
|||
func (c *commandFsDu) Help() string {
|
||||
return `show disk usage
|
||||
|
||||
fs.du http://<filer_server>:<port>/dir
|
||||
fs.du http://<filer_server>:<port>/dir/file_name
|
||||
fs.du http://<filer_server>:<port>/dir/file_prefix
|
||||
fs.du /dir
|
||||
fs.du /dir/file_name
|
||||
fs.du /dir/file_prefix
|
||||
`
|
||||
}
|
||||
|
||||
|
|
|
@ -30,9 +30,6 @@ func (c *commandFsLs) Help() string {
|
|||
fs.ls [-l] [-a] /dir/
|
||||
fs.ls [-l] [-a] /dir/file_name
|
||||
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
|
||||
`
|
||||
}
|
||||
|
||||
|
|
|
@ -26,8 +26,6 @@ func (c *commandFsMetaCat) Help() string {
|
|||
|
||||
fs.meta.cat /dir/
|
||||
fs.meta.cat /dir/file_name
|
||||
fs.meta.cat http://<filer_server>:<port>/dir/
|
||||
fs.meta.cat http://<filer_server>:<port>/dir/file_name
|
||||
`
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,8 @@ func (c *commandFsTree) Name() string {
|
|||
func (c *commandFsTree) Help() string {
|
||||
return `recursively list all files under a directory
|
||||
|
||||
fs.tree http://<filer_server>:<port>/dir/
|
||||
fs.tree /some/dir
|
||||
|
||||
`
|
||||
}
|
||||
|
||||
|
|
|
@ -50,7 +50,8 @@ func NewCommandEnv(options ShellOptions) *CommandEnv {
|
|||
|
||||
func (ce *CommandEnv) parseUrl(input string) (filerServer string, filerPort int64, path string, err error) {
|
||||
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, "/") {
|
||||
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
|
||||
} 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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue