core/commands2: Replaced NewDagFromReader with BuildDagFromReader
Matt Bell committed
Nov 9, 2014 at 17:59 UTC
91da11ae66fcd5fe758728f26b874725b6f54cb9
1 file changed
+8
-6
core/commands2/add.go
+8
-6
@@ -9,7 +9,9 @@ import (
9
core "github.com/jbenet/go-ipfs/core"
10
internal "github.com/jbenet/go-ipfs/core/commands2/internal"
11
importer "github.com/jbenet/go-ipfs/importer"
12
+ "github.com/jbenet/go-ipfs/importer/chunk"
13
dag "github.com/jbenet/go-ipfs/merkledag"
14
+ pinning "github.com/jbenet/go-ipfs/pin"
15
)
16
17
// Error indicating the max depth has been exceded.
@@ -35,11 +37,6 @@ var addCmd = &cmds.Command{
37
Run: func(res cmds.Response, req cmds.Request) {
38
n := req.Context().Node
39
38
- // if recursive, set depth to reflect so
39
- // opt, found := req.Option("r")
40
- // if r, _ := opt.(bool); found && r {
41
- // }
42
-
40
readers, err := internal.CastToReaders(req.Arguments())
41
if err != nil {
42
res.SetError(err, cmds.ErrNormal)
@@ -88,10 +85,15 @@ var addCmd = &cmds.Command{
85
}
86
87
func add(n *core.IpfsNode, readers []io.Reader) ([]*dag.Node, error) {
88
+ mp, ok := n.Pinning.(pinning.ManualPinner)
89
+ if !ok {
90
+ return nil, errors.New("invalid pinner type! expected manual pinner")
91
+ }
92
+
93
dagnodes := make([]*dag.Node, 0)
94
95
for _, reader := range readers {
94
- node, err := importer.NewDagFromReader(reader)
96
+ node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter)
97
if err != nil {
98
return nil, err
99
}