Skip to content

Commit

Permalink
feat: add --long as alias for -l in files.ls
Browse files Browse the repository at this point in the history
Allow passing --long or ?long=true as a more descriptive option name than "l".

refs: https://github.com/ipfs/go-ipfs#issuecomment-392477565
  • Loading branch information
alanshaw committed Jul 17, 2019
1 parent 920572b commit 76f2960
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions core/commands/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ type filesLsOutput struct {
}

const (
longOptionName = "l"
longOptionName = "long"
dontSortOptionName = "U"
)

Expand Down Expand Up @@ -408,7 +408,7 @@ Examples:
cmds.StringArg("path", false, false, "Path to show listing for. Defaults to '/'."),
},
Options: []cmds.Option{
cmds.BoolOption(longOptionName, "Use long listing format."),
cmds.BoolOption(longOptionName, "l", "Use long listing format."),
cmds.BoolOption(dontSortOptionName, "Do not sort; list entries in directory order."),
},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
Expand Down
8 changes: 7 additions & 1 deletion test/sharness/t0250-files-api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,12 @@ test_files_api() {
test_cmp ls_l_expected ls_l_actual
'

test_expect_success "file has correct hash and size listed with --long" '
echo "file1 $FILE1 4" > ls_l_expected &&
ipfs files ls --long /cats/file1 > ls_l_actual &&
test_cmp ls_l_expected ls_l_actual
'

test_expect_success "file has correct hash and size listed with -l --cid-base=base32" '
echo "file1 `cid-fmt -v 1 -b base32 %s $FILE1` 4" > ls_l_expected &&
ipfs files ls --cid-base=base32 -l /cats/file1 > ls_l_actual &&
Expand Down Expand Up @@ -436,7 +442,7 @@ test_files_api() {
test_expect_success "file hash correct $EXTRA" '
echo $FILE_HASH > filehash_expected &&
ipfs files stat --hash /cats/ipfs > filehash &&
test_cmp filehash_expected filehash
test_cmp filehash_expected filehash
'

test_expect_success "cant write to negative offset $EXTRA" '
Expand Down

0 comments on commit 76f2960

Please sign in to comment.