restore add.go from master
Juan Batiz-Benet committed
Nov 4, 2014 at 02:25 UTC
fd1cd995562c8b8aef96928ac343352ed155da5b
1 file changed
+4
-8
core/commands/add.go
+4
-8
@@ -10,11 +10,9 @@ import (
10
11
"github.com/jbenet/go-ipfs/core"
12
"github.com/jbenet/go-ipfs/importer"
13
- "github.com/jbenet/go-ipfs/importer/chunk"
13
dag "github.com/jbenet/go-ipfs/merkledag"
14
"github.com/jbenet/go-ipfs/pin"
15
ft "github.com/jbenet/go-ipfs/unixfs"
17
- uio "github.com/jbenet/go-ipfs/unixfs/io"
16
)
17
18
// Error indicating the max depth has been exceded.
@@ -84,28 +82,26 @@ func addDir(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Node
82
}
83
}
84
87
- log.Info("adding dir: %s", fpath)
85
+ log.Infof("adding dir: %s", fpath)
86
87
return tree, addNode(n, tree, fpath, out)
88
}
89
90
func addFile(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Node, error) {
93
- dw := uio.NewDagWriter(n.DAG, chunk.DefaultSplitter)
91
mp, ok := n.Pinning.(pin.ManualPinner)
92
if !ok {
93
return nil, errors.New("invalid pinner type! expected manual pinner")
94
}
98
- dw.Pinner = mp
95
100
- root, err := importer.ImportFileDag(fpath, dw)
96
+ root, err := importer.BuildDagFromFile(fpath, n.DAG, mp)
97
if err != nil {
98
return nil, err
99
}
100
105
- log.Info("adding file: %s", fpath)
101
+ log.Infof("adding file: %s", fpath)
102
103
for _, l := range root.Links {
108
- log.Info("adding subblock: %s %s", l.Name, l.Hash.B58String())
104
+ log.Infof("adding subblock: '%s' %s", l.Name, l.Hash.B58String())
105
}
106
107
k, err := root.Key()