Commit 641c20b9 authored by W. Trevor King's avatar W. Trevor King

core/coreunixs/add: Change add() to only accept a single reader

Catch up with core/commands/add.go.
parent c322a4eb
......@@ -86,24 +86,23 @@ func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *merkle
return gopath.Join(k.String(), filename), dagnode, nil
}
func add(n *core.IpfsNode, readers []io.Reader) ([]*merkledag.Node, error) {
func add(n *core.IpfsNode, reader io.Reader) (*merkledag.Node, error) {
mp, ok := n.Pinning.(pin.ManualPinner)
if !ok {
return nil, errors.New("invalid pinner type! expected manual pinner")
}
dagnodes := make([]*merkledag.Node, 0)
for _, reader := range readers {
node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter)
if err != nil {
return nil, err
}
dagnodes = append(dagnodes, node)
node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter)
if err != nil {
return nil, err
}
err := n.Pinning.Flush()
err = n.Pinning.Flush()
if err != nil {
return nil, err
}
return dagnodes, nil
return node, nil
}
func addNode(n *core.IpfsNode, node *merkledag.Node) error {
......@@ -125,12 +124,12 @@ func addFile(n *core.IpfsNode, file files.File) (*merkledag.Node, error) {
return addDir(n, file)
}
dns, err := add(n, []io.Reader{file})
dagnode, err := add(n, file)
if err != nil {
return nil, err
}
return dns[len(dns)-1], nil // last dag node is the file.
return dagnode, nil
}
func addDir(n *core.IpfsNode, dir files.File) (*merkledag.Node, error) {
......
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