unistack-org/blob-ftp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong list command

Browse Source 
closes #12

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов
2015-04-30 18:05:59 +03:00
parent e1b74fdc9e
commit 8408ba324a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@@ -168,12 +168,22 @@ func (s *Conn) cmdServerList(args string) {
case "-la", "-l", "-a", "-al": case "-la", "-l", "-a", "-al":
args = "" args = ""
} }
if len(args) > 0 && args[0] == '/' {
if strings.HasPrefix(args, "/") {
cnt = strings.Split(args, "/")[1] cnt = strings.Split(args, "/")[1]
p = strings.Join(strings.Split(args, "/")[2:], "/") p = strings.Join(strings.Split(args, "/")[2:], "/")
} else {
if s.path != "/" {
if strings.HasPrefix(s.path, "/") {
cnt = strings.Split(s.path, "/")[1]
p = args
}
} else {
cnt = strings.Split(args, "/")[0]
}
} }
if cnt == "" && s.path == "/" { if cnt == "" {
cnts, err := s.sw.ContainersAll(nil) cnts, err := s.sw.ContainersAll(nil)
if err != nil { if err != nil {
fmt.Printf(err.Error()) fmt.Printf(err.Error())
@@ -186,8 +196,6 @@ func (s *Conn) cmdServerList(args string) {
} }
} else { } else {
opts := &swift.ObjectsOpts{Delimiter: '/'} opts := &swift.ObjectsOpts{Delimiter: '/'}
cnt = strings.Split(s.path, "/")[1]
p = filepath.Clean(filepath.Join(strings.Join(strings.Split(s.path, "/")[2:], "/"), args))
fmt.Printf("cnt: %s p: %s\n", cnt, p) fmt.Printf("cnt: %s p: %s\n", cnt, p)
if p != "." { if p != "." {
opts.Path = p opts.Path = p
@@ -257,8 +265,6 @@ func (s *Conn) cmdServerNlst(args string) {
} }
} else { } else {
opts := &swift.ObjectsOpts{Delimiter: '/'} opts := &swift.ObjectsOpts{Delimiter: '/'}
cnt = strings.Split(s.path, "/")[1]
p = filepath.Clean(filepath.Join(strings.Join(strings.Split(s.path, "/")[2:], "/"), args))
fmt.Printf("cnt: %s p: %s\n", cnt, p) fmt.Printf("cnt: %s p: %s\n", cnt, p)
if p != "." { if p != "." {
opts.Path = p opts.Path = p
@@ -290,7 +296,7 @@ func (s *Conn) cmdServerNlst(args string) {
s.data = c s.data = c
defer c.Close() defer c.Close()
_, err = c.Write([]byte(strings.Join(files, "\r\n"))) _, err = c.Write([]byte(strings.Join(files, "\r\n") + "\r\n"))
if err != nil { if err != nil {
s.ctrl.PrintfLine("425 Data connection failed") s.ctrl.PrintfLine("425 Data connection failed")
fmt.Printf(err.Error()) fmt.Printf(err.Error())