Address concerns in PR

ipfs · Oct 30, 2014 · 71ac117 · 71ac117
1 parent 18ada93
commit 71ac117
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/core/commands/add.go b/core/commands/add.go
@@ -10,8 +10,11 @@ import (
 
 	"github.com/jbenet/go-ipfs/core"
 	"github.com/jbenet/go-ipfs/importer"
+	"github.com/jbenet/go-ipfs/importer/chunk"
 	dag "github.com/jbenet/go-ipfs/merkledag"
+	"github.com/jbenet/go-ipfs/pin"
 	ft "github.com/jbenet/go-ipfs/unixfs"
+	uio "github.com/jbenet/go-ipfs/unixfs/io"
 )
 
 // Error indicating the max depth has been exceded.
@@ -87,7 +90,14 @@ func addDir(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Node
 }
 
 func addFile(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Node, error) {
-	root, err := importer.NewDagFromFileWServer(fpath, n.DAG, n.Pinning)
+	dw := uio.NewDagWriter(n.DAG, chunk.DefaultSplitter)
+	mp, ok := n.Pinning.(pin.ManualPinner)
+	if !ok {
+		return nil, errors.New("invalid pinner type! expected manual pinner")
+	}
+	dw.Pinner = mp
+
+	root, err := importer.ImportFileDag(fpath, dw)
 	if err != nil {
 		return nil, err
 	}

diff --git a/importer/importer.go b/importer/importer.go
@@ -1,14 +1,12 @@
 package importer
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
 
 	"github.com/jbenet/go-ipfs/importer/chunk"
 	dag "github.com/jbenet/go-ipfs/merkledag"
-	"github.com/jbenet/go-ipfs/pin"
 	ft "github.com/jbenet/go-ipfs/unixfs"
 	uio "github.com/jbenet/go-ipfs/unixfs/io"
 	"github.com/jbenet/go-ipfs/util"
@@ -76,7 +74,7 @@ func NewDagFromFile(fpath string) (*dag.Node, error) {
 	return NewDagFromReader(f)
 }
 
-func NewDagFromFileWServer(fpath string, dserv dag.DAGService, p pin.Pinner) (*dag.Node, error) {
+func ImportFileDag(fpath string, dw *uio.DagWriter) (*dag.Node, error) {
 	stat, err := os.Stat(fpath)
 	if err != nil {
 		return nil, err
@@ -92,17 +90,10 @@ func NewDagFromFileWServer(fpath string, dserv dag.DAGService, p pin.Pinner) (*d
 	}
 	defer f.Close()
 
-	return NewDagFromReaderWServer(f, dserv, p)
+	return ImportReaderDag(f, dw)
 }
 
-func NewDagFromReaderWServer(r io.Reader, dserv dag.DAGService, p pin.Pinner) (*dag.Node, error) {
-	dw := uio.NewDagWriter(dserv, chunk.DefaultSplitter)
-
-	mp, ok := p.(pin.ManualPinner)
-	if !ok {
-		return nil, errors.New("Needed to be passed a manual pinner!")
-	}
-	dw.Pinner = mp
+func ImportReaderDag(r io.Reader, dw *uio.DagWriter) (*dag.Node, error) {
 	_, err := io.Copy(dw, r)
 	if err != nil {
 		return nil, err