Skip to content

Commit

Permalink
Merge pull request #5605 from overbool/feat/add-slash-in-files-ls
Browse files Browse the repository at this point in the history
fix(files): add slash for dir
  • Loading branch information
Stebalien authored Oct 18, 2018
2 parents f41208b + ec8e451 commit 084c7d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
5 changes: 4 additions & 1 deletion core/commands/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ Examples:
return
case *mfs.File:
_, name := gopath.Split(path)
out := &filesLsOutput{[]mfs.NodeListing{mfs.NodeListing{Name: name}}}
out := &filesLsOutput{[]mfs.NodeListing{{Name: name}}}
if long {
out.Entries[0].Type = int(fsn.Type())

Expand Down Expand Up @@ -527,6 +527,9 @@ Examples:
long, _, _ := res.Request().Option(longOptionName).Bool()
for _, o := range out.Entries {
if long {
if o.Type == int(mfs.TDir) {
o.Name += "/"
}
fmt.Fprintf(buf, "%s\t%s\t%d\n", o.Name, o.Hash, o.Size)
} else {
fmt.Fprintf(buf, "%s\n", o.Name)
Expand Down
7 changes: 7 additions & 0 deletions test/sharness/t0250-files-api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,13 @@ test_files_api() {
verify_dir_contents /cats/this/is/a/dir
'

test_expect_success "dir has correct name" '
DIR_HASH=$(ipfs files stat /cats/this --hash) &&
echo "this/ $DIR_HASH 0" > ls_dir_expected &&
ipfs files ls -l /cats | grep this/ > ls_dir_actual &&
test_cmp ls_dir_expected ls_dir_actual
'

test_expect_success "can copy file into new dir $EXTRA" '
ipfs files cp /ipfs/$FILE3 /cats/this/is/a/dir/file3
'
Expand Down

0 comments on commit 084c7d1

Please sign in to comment.