brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #54 from 0086/master

Browse Source 
Fix ls bug for file or folder name includes multiple spaces
This commit is contained in:
Julien Laffaye 2016-11-24 10:13:12 +01:00 committed by GitHub
commit c47cb8ca13
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ftp.go
View File

@ -325,6 +325,22 @@ func parseRFC3659ListLine(line string) (*Entry, error) {
return e, nil return e, nil
} }
// parse file or folder name with multiple spaces
func parseLsListLineName(line string, fields []string, offset int) string {
if offset < 1 {
return ""
}
match := fields[offset-1]
index := strings.Index(line, match)
if index == -1 {
return ""
}
index += len(match)
return strings.TrimSpace(line[index:])
}
// parseLsListLine parses a directory line in a format based on the output of // parseLsListLine parses a directory line in a format based on the output of
// the UNIX ls command. // the UNIX ls command.
func parseLsListLine(line string) (*Entry, error) { func parseLsListLine(line string) (*Entry, error) {
@ -384,7 +400,11 @@ func parseLsListLine(line string) (*Entry, error) {
return nil, err return nil, err
} }
e.Name = parseLsListLineName(line, fields, 8)
if len(e.Name) == 0 {
e.Name = strings.Join(fields[8:], " ") e.Name = strings.Join(fields[8:], " ")
}
return e, nil return e, nil
} }

4
parse_test.go
View File

@ -49,6 +49,10 @@ var listTests = []line{
// DOS DIR command output // DOS DIR command output
{"08-07-15 07:50PM 718 Post_PRR_20150901_1166_265118_13049.dat", "Post_PRR_20150901_1166_265118_13049.dat", 718, EntryTypeFile, time.Date(2015, time.August, 7, 19, 50, 0, 0, time.UTC)}, {"08-07-15 07:50PM 718 Post_PRR_20150901_1166_265118_13049.dat", "Post_PRR_20150901_1166_265118_13049.dat", 718, EntryTypeFile, time.Date(2015, time.August, 7, 19, 50, 0, 0, time.UTC)},
{"08-10-15 02:04PM <DIR> Billing", "Billing", 0, EntryTypeFolder, time.Date(2015, time.August, 10, 14, 4, 0, 0, time.UTC)}, {"08-10-15 02:04PM <DIR> Billing", "Billing", 0, EntryTypeFolder, time.Date(2015, time.August, 10, 14, 4, 0, 0, time.UTC)},
// dir and file names that contain multiple spaces
{"drwxr-xr-x 3 110 1002 3 Dec 02 2009 spaces dir name", "spaces dir name", 0, EntryTypeFolder, time.Date(2009, time.December, 2, 0, 0, 0, 0, time.UTC)},
{"-rwxr-xr-x 3 110 1002 1234567 Dec 02 2009 file name", "file name", 1234567, EntryTypeFile, time.Date(2009, time.December, 2, 0, 0, 0, 0, time.UTC)},
} }
// Not supported, we expect a specific error message // Not supported, we expect a specific error message