opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 01:12:24 +08:00
Code Issues Projects Releases Wiki Activity

core/commands2: Replaced NewDagFromReader with BuildDagFromReader

Browse Source
This commit is contained in:
Matt Bell
2014-11-09 17:59:20 -08:00
committed by Juan Batiz-Benet
parent f4d0b8baa0
commit 91da11ae66
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/commands2/add.go
View File

@ -9,7 +9,9 @@ import (
core "github.com/jbenet/go-ipfs/core" core "github.com/jbenet/go-ipfs/core"
internal "github.com/jbenet/go-ipfs/core/commands2/internal" internal "github.com/jbenet/go-ipfs/core/commands2/internal"
importer "github.com/jbenet/go-ipfs/importer" importer "github.com/jbenet/go-ipfs/importer"
"github.com/jbenet/go-ipfs/importer/chunk"
dag "github.com/jbenet/go-ipfs/merkledag" dag "github.com/jbenet/go-ipfs/merkledag"
pinning "github.com/jbenet/go-ipfs/pin"
) )
// Error indicating the max depth has been exceded. // Error indicating the max depth has been exceded.
@ -35,11 +37,6 @@ var addCmd = &cmds.Command{
Run: func(res cmds.Response, req cmds.Request) { Run: func(res cmds.Response, req cmds.Request) {
n := req.Context().Node 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()) readers, err := internal.CastToReaders(req.Arguments())
if err != nil { if err != nil {
res.SetError(err, cmds.ErrNormal) res.SetError(err, cmds.ErrNormal)
@ -88,10 +85,15 @@ var addCmd = &cmds.Command{
} }
func add(n *core.IpfsNode, readers []io.Reader) ([]*dag.Node, error) { 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) dagnodes := make([]*dag.Node, 0)
for _, reader := range readers { for _, reader := range readers {
node, err := importer.NewDagFromReader(reader) node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter)
if err != nil { if err != nil {
return nil, err return nil, err
} }