http gw: remove newDagEmptyDir helper
Henry committed
May 4, 2015 at 14:02 UTC
31b83abfe4d12b89229d2d0610cd0731ff5f5653
1 file changed
+5
-8
core/corehttp/gateway_handler.go
+5
-8
@@ -19,7 +19,6 @@ import (
19
dag "github.com/ipfs/go-ipfs/merkledag"
20
path "github.com/ipfs/go-ipfs/path"
21
"github.com/ipfs/go-ipfs/routing"
22
- ufs "github.com/ipfs/go-ipfs/unixfs"
22
uio "github.com/ipfs/go-ipfs/unixfs/io"
23
u "github.com/ipfs/go-ipfs/util"
24
)
@@ -71,14 +70,12 @@ func (i *gatewayHandler) loadTemplate() error {
70
71
// TODO(cryptix): find these helpers somewhere else
72
func (i *gatewayHandler) newDagFromReader(r io.Reader) (*dag.Node, error) {
73
+ // TODO(cryptix): change and remove this helper once PR1136 is merged
74
+ // return ufs.AddFromReader(i.node, r.Body)
75
return importer.BuildDagFromReader(
76
r, i.node.DAG, i.node.Pinning.GetManual(), chunk.DefaultSplitter)
77
}
78
78
-func newDagEmptyDir() *dag.Node {
79
- return &dag.Node{Data: ufs.FolderPBData()}
80
-}
81
-
79
// TODO(btc): break this apart into separate handlers using a more expressive muxer
80
func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
81
if i.config.Writable {
@@ -243,7 +240,7 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
240
}
241
242
func (i *gatewayHandler) putEmptyDirHandler(w http.ResponseWriter, r *http.Request) {
246
- newnode := newDagEmptyDir()
243
+ newnode := uio.NewDirectory(i.node.DAG).GetNode()
244
245
key, err := i.node.DAG.Add(newnode)
246
if err != nil {
@@ -269,7 +266,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
266
267
var newnode *dag.Node
268
if pathext[len(pathext)-1] == '/' {
272
- newnode = newDagEmptyDir()
269
+ newnode = uio.NewDirectory(i.node.DAG).GetNode()
270
} else {
271
newnode, err = i.newDagFromReader(r.Body)
272
if err != nil {
@@ -321,7 +318,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
318
if _, ok := err.(path.ErrNoLink); ok {
319
// Create empty directories, links will be made further down the code
320
for len(pathNodes) < len(components) {
324
- pathNodes = append(pathNodes, newDagEmptyDir())
321
+ pathNodes = append(pathNodes, uio.NewDirectory(i.node.DAG).GetNode())
322
}
323
} else if err != nil {
324
webError(w, "Could not resolve parent object", err, http.StatusBadRequest)