coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-07 01:08:08 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #5045 from schomatis/fix/cmd/files-ls-file-long

Browse Source 
cmd: fix `files ls` to report hash and size for files
This commit is contained in:
Whyrusleeping 2018-07-16 16:52:13 +02:00 committed by GitHub
commit bda81cd2d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/commands/files.go
View File

@ -462,7 +462,24 @@ Examples:
return
case *mfs.File:
_, name := gopath.Split(path)
out := &filesLsOutput{[]mfs.NodeListing{mfs.NodeListing{Name: name, Type: 1}}}
out := &filesLsOutput{[]mfs.NodeListing{mfs.NodeListing{Name: name}}}
if long {
out.Entries[0].Type = int(fsn.Type())
size, err := fsn.Size()
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
}
out.Entries[0].Size = size
nd, err := fsn.GetNode()
if err != nil {
res.SetError(err, cmdkit.ErrNormal)
return
}
out.Entries[0].Hash = nd.Cid().String()
}
res.SetOutput(out)
return
default:

12
test/sharness/t0250-files-api.sh
View File

@ -186,6 +186,18 @@ test_files_api() {
test_cmp ls_l_expected ls_l_actual
'
test_expect_success "file has correct hash and size listed with -l" '
echo "file1 $FILE1 4" > ls_l_expected &&
ipfs files ls -l /cats/file1 > ls_l_actual &&
test_cmp ls_l_expected ls_l_actual
'
test_expect_success "file shows up with the correct name" '
echo "file1" > ls_l_expected &&
ipfs files ls /cats/file1 > ls_l_actual &&
test_cmp ls_l_expected ls_l_actual
'
test_expect_success "can stat file $EXTRA" '
ipfs files stat /cats/file1 > file1stat_orig
'