Cleanup coreunix cat
License: MIT Signed-off-by: rht <rhtbot@gmail.com>
rht committed
Aug 26, 2015 at 16:50 UTC
a7f43de5f2a688b127730e1d2f595fcc13bb58c8
2 files changed
+3
-11
core/commands/cat.go
+2
-8
@@ -6,8 +6,7 @@ import (
6
7
cmds "github.com/ipfs/go-ipfs/commands"
8
core "github.com/ipfs/go-ipfs/core"
9
- path "github.com/ipfs/go-ipfs/path"
10
- uio "github.com/ipfs/go-ipfs/unixfs/io"
9
+ coreunix "github.com/ipfs/go-ipfs/core/coreunix"
10
11
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
12
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
@@ -68,12 +67,7 @@ func cat(ctx context.Context, node *core.IpfsNode, paths []string) ([]io.Reader,
67
readers := make([]io.Reader, 0, len(paths))
68
length := uint64(0)
69
for _, fpath := range paths {
71
- dagnode, err := core.Resolve(ctx, node, path.Path(fpath))
72
- if err != nil {
73
- return nil, 0, err
74
- }
75
-
76
- read, err := uio.NewDagReader(ctx, dagnode, node.DAG)
70
+ read, err := coreunix.Cat(node, fpath)
71
if err != nil {
72
return nil, 0, err
73
}
core/coreunix/cat.go
+1
-3
@@ -1,14 +1,12 @@
1
package coreunix
2
3
import (
4
- "io"
5
-
4
core "github.com/ipfs/go-ipfs/core"
5
path "github.com/ipfs/go-ipfs/path"
6
uio "github.com/ipfs/go-ipfs/unixfs/io"
7
)
8
11
-func Cat(n *core.IpfsNode, pstr string) (io.Reader, error) {
9
+func Cat(n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
10
p := path.FromString(pstr)
11
dagNode, err := n.Resolver.ResolvePath(n.Context(), p)
12
if err != nil {