Partial ipld node impl

Author: magik6k

api.go

@@ -1,7 +1,7 @@
 package httpapi
 
 import (
-	"github.com/pkg/errors"
+	"errors"
 	"io/ioutil"
 	gohttp "net/http"
 	"os"
@@ -12,7 +12,7 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr-net"
-	)
+)
 
 const (
 	DefaultPathName = ".ipfs"
@@ -91,7 +91,7 @@ func (api *HttpApi) Unixfs() iface.UnixfsAPI {
 }
 
 func (api *HttpApi) Block() iface.BlockAPI {
-	return nil
+	return (*BlockAPI)(api)
 }
 
 func (api *HttpApi) Dag() iface.DagAPI {

block.go

@@ -0,0 +1,40 @@
+package httpapi
+
+import (
+	"context"
+	"io"
+
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+type BlockAPI HttpApi
+
+func (api *BlockAPI) Put(ctx context.Context, r io.Reader, opts ...options.BlockPutOption) (iface.BlockStat, error) {
+	return nil, ErrNotImplemented
+}
+
+func (api *BlockAPI) Get(ctx context.Context, p iface.Path) (io.Reader, error) {
+	resp, err := api.core().request("block/get", p.String()).Send(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
+	//TODO: is close on the reader enough?
+	//defer resp.Close()
+
+	//TODO: make blockApi return ReadCloser
+	return resp.Output, resp.Error
+}
+
+func (api *BlockAPI) Rm(ctx context.Context, p iface.Path, opts ...options.BlockRmOption) error {
+	return ErrNotImplemented
+}
+
+func (api *BlockAPI) Stat(ctx context.Context, p iface.Path) (iface.BlockStat, error) {
+	return nil, ErrNotImplemented
+}
+
+func (api *BlockAPI) core() *HttpApi {
+	return (*HttpApi)(api)
+}

ipldnode.go

@@ -0,0 +1,107 @@
+package httpapi
+
+import (
+	"context"
+	"fmt"
+	"github.com/pkg/errors"
+	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	"io/ioutil"
+	"strconv"
+
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
+
+	ipfspath "gx/ipfs/QmRG3XuGwT7GYuAqgWDJBKTzdaHMwAnc1x7J2KHEXNHxzG/go-path"
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
+)
+
+type ipldNode struct {
+	ctx  context.Context //TODO: should we re-consider adding ctx to ipld interfaces?
+	path iface.ResolvedPath
+	api  *HttpApi
+}
+
+func (n *ipldNode) RawData() []byte {
+	r, err := n.api.Block().Get(n.ctx, n.path)
+	if err != nil {
+		panic(err) // TODO: eww, should we add errors too / better ideas?
+	}
+
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		panic(err)
+	}
+
+	return b
+}
+
+func (n *ipldNode) Cid() cid.Cid {
+	return n.path.Cid()
+}
+
+func (n *ipldNode) String() string {
+	return fmt.Sprintf("[Block %s]", n.Cid())
+}
+
+func (n *ipldNode) Loggable() map[string]interface{} {
+	return nil //TODO: we can't really do better here, can we?
+}
+
+// TODO: should we use 'full'/real ipld codecs for this? js-ipfs-api does that.
+// We can also give people a choice
+func (n *ipldNode) Resolve(path []string) (interface{}, []string, error) {
+	p := ipfspath.Join([]string{n.path.String(), ipfspath.Join(path)})
+
+	var out interface{}
+	n.api.request("dag/get", p).Exec(n.ctx, &out)
+
+	// TODO: this is more than likely wrong, fix if we decide to stick with this 'http-ipld-node' hack
+	for len(path) > 0 {
+		switch o := out.(type) {
+		case map[string]interface{}:
+			v, ok := o[path[0]]
+			if !ok {
+				// TODO: ipld links
+				return nil, nil, errors.New("no element under this path")
+			}
+			out = v
+		case []interface{}:
+			n, err := strconv.ParseUint(path[0], 10, 32)
+			if err != nil {
+				return nil, nil, err
+			}
+			if len(o) < int(n) {
+				return nil, nil, errors.New("no element under this path")
+			}
+			out = o[n]
+		}
+		path = path[1:]
+	}
+
+	return out, path, nil
+}
+
+func (n *ipldNode) Tree(path string, depth int) []string {
+	panic("implement me")
+}
+
+func (n *ipldNode) ResolveLink(path []string) (*ipld.Link, []string, error) {
+	panic("implement me")
+}
+
+func (n *ipldNode) Copy() ipld.Node {
+	panic("implement me")
+}
+
+func (n *ipldNode) Links() []*ipld.Link {
+	panic("implement me")
+}
+
+func (n *ipldNode) Stat() (*ipld.NodeStat, error) {
+	panic("implement me")
+}
+
+func (n *ipldNode) Size() (uint64, error) {
+	panic("implement me")
+}
+
+var _ ipld.Node = &ipldNode{}

path.go

@@ -30,7 +30,7 @@ func (api *HttpApi) ResolvePath(ctx context.Context, path iface.Path) (iface.Res
 	}
 
 	// TODO:
-	ipath, err := ipfspath.FromSegments("/" +path.Namespace() + "/", out.Cid.String(), out.RemPath)
+	ipath, err := ipfspath.FromSegments("/"+path.Namespace()+"/", out.Cid.String(), out.RemPath)
 	if err != nil {
 		return nil, err
 	}