cmds/tar: use the coreapi
Steven Allen committed
Aug 21, 2019 at 19:24 UTC
8643d949f375e3564f9698a791c3794a815a40a7
1 file changed
+6
-12
core/commands/tar.go
+6
-12
@@ -5,12 +5,11 @@ import (
5
"io"
6
7
"github.com/ipfs/go-ipfs/core/commands/cmdenv"
8
- "github.com/ipfs/go-ipfs/namesys/resolve"
8
tar "github.com/ipfs/go-ipfs/tar"
9
10
"github.com/ipfs/go-ipfs-cmds"
11
dag "github.com/ipfs/go-merkledag"
13
- "github.com/ipfs/go-path"
12
+ path "github.com/ipfs/interface-go-ipfs-core/path"
13
)
14
15
var TarCmd = &cmds.Command{
@@ -37,7 +36,7 @@ represent it.
36
cmds.FileArg("file", true, false, "Tar file to add.").EnableStdin(),
37
},
38
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
40
- nd, err := cmdenv.GetNode(env)
39
+ api, err := cmdenv.GetApi(env, req)
40
if err != nil {
41
return err
42
}
@@ -53,7 +52,7 @@ represent it.
52
return err
53
}
54
56
- node, err := tar.ImportTar(req.Context, file, nd.DAG)
55
+ node, err := tar.ImportTar(req.Context, file, api.Dag())
56
if err != nil {
57
return err
58
}
@@ -86,17 +85,12 @@ var tarCatCmd = &cmds.Command{
85
cmds.StringArg("path", true, false, "ipfs path of archive to export.").EnableStdin(),
86
},
87
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
89
- nd, err := cmdenv.GetNode(env)
88
+ api, err := cmdenv.GetApi(env, req)
89
if err != nil {
90
return err
91
}
92
94
- p, err := path.ParsePath(req.Arguments[0])
95
- if err != nil {
96
- return err
97
- }
98
-
99
- root, err := resolve.Resolve(req.Context, nd.Namesys, nd.Resolver, p)
93
+ root, err := api.ResolveNode(req.Context, path.New(req.Arguments[0]))
94
if err != nil {
95
return err
96
}
@@ -106,7 +100,7 @@ var tarCatCmd = &cmds.Command{
100
return dag.ErrNotProtobuf
101
}
102
109
- r, err := tar.ExportTar(req.Context, rootpb, nd.DAG)
103
+ r, err := tar.ExportTar(req.Context, rootpb, api.Dag())
104
if err != nil {
105
return err
106
}