Commit 91da11ae authored by Matt Bell's avatar Matt Bell Committed by Juan Batiz-Benet

core/commands2: Replaced NewDagFromReader with BuildDagFromReader

parent f4d0b8ba
......@@ -9,7 +9,9 @@ import (
core "github.com/jbenet/go-ipfs/core"
internal "github.com/jbenet/go-ipfs/core/commands2/internal"
importer "github.com/jbenet/go-ipfs/importer"
"github.com/jbenet/go-ipfs/importer/chunk"
dag "github.com/jbenet/go-ipfs/merkledag"
pinning "github.com/jbenet/go-ipfs/pin"
)
// Error indicating the max depth has been exceded.
......@@ -35,11 +37,6 @@ var addCmd = &cmds.Command{
Run: func(res cmds.Response, req cmds.Request) {
n := req.Context().Node
// if recursive, set depth to reflect so
// opt, found := req.Option("r")
// if r, _ := opt.(bool); found && r {
// }
readers, err := internal.CastToReaders(req.Arguments())
if err != nil {
res.SetError(err, cmds.ErrNormal)
......@@ -88,10 +85,15 @@ var addCmd = &cmds.Command{
}
func add(n *core.IpfsNode, readers []io.Reader) ([]*dag.Node, error) {
mp, ok := n.Pinning.(pinning.ManualPinner)
if !ok {
return nil, errors.New("invalid pinner type! expected manual pinner")
}
dagnodes := make([]*dag.Node, 0)
for _, reader := range readers {
node, err := importer.NewDagFromReader(reader)
node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter)
if err != nil {
return nil, err
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment