From 88139ddc50e111e39721990bb86bb1c018c488b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 4 Feb 2019 19:45:24 +0100
Subject: [PATCH] dag: Interface updates

This commit was moved from ipfs/go-ipfs-http-client@7bea2efb45cba072b4e24c20b46a4372be3a716d
---
 client/httpapi/api.go |  3 +--
 client/httpapi/dag.go | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/client/httpapi/api.go b/client/httpapi/api.go
index 7d4fbd0e0..2c7a97c99 100644
--- a/client/httpapi/api.go
+++ b/client/httpapi/api.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"github.com/ipfs/go-ipld-format"
 	homedir "github.com/mitchellh/go-homedir"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr-net"
@@ -139,7 +138,7 @@ func (api *HttpApi) Block() iface.BlockAPI {
 	return (*BlockAPI)(api)
 }
 
-func (api *HttpApi) Dag() format.DAGService {
+func (api *HttpApi) Dag() iface.APIDagService {
 	return (*HttpDagServ)(api)
 }
 
diff --git a/client/httpapi/dag.go b/client/httpapi/dag.go
index de2934c2f..eacf631b9 100644
--- a/client/httpapi/dag.go
+++ b/client/httpapi/dag.go
@@ -15,7 +15,9 @@ import (
 	"github.com/ipfs/go-ipld-format"
 )
 
-type HttpDagServ HttpApi
+type httpNodeAdder HttpApi
+type HttpDagServ httpNodeAdder
+type pinningHttpNodeAdder httpNodeAdder
 
 func (api *HttpDagServ) Get(ctx context.Context, c cid.Cid) (format.Node, error) {
 	r, err := api.core().Block().Get(ctx, iface.IpldPath(c))
@@ -56,7 +58,7 @@ func (api *HttpDagServ) GetMany(ctx context.Context, cids []cid.Cid) <-chan *for
 	return out
 }
 
-func (api *HttpDagServ) Add(ctx context.Context, nd format.Node) error {
+func (api *httpNodeAdder) add(ctx context.Context, nd format.Node, pin bool) error {
 	c := nd.Cid()
 	prefix := c.Prefix()
 	format := cid.CodecToStr[prefix.Codec]
@@ -65,7 +67,9 @@ func (api *HttpDagServ) Add(ctx context.Context, nd format.Node) error {
 	}
 
 	stat, err := api.core().Block().Put(ctx, bytes.NewReader(nd.RawData()),
-		options.Block.Hash(prefix.MhType, prefix.MhLength), options.Block.Format(format))
+		options.Block.Hash(prefix.MhType, prefix.MhLength),
+		options.Block.Format(format),
+		options.Block.Pin(pin))
 	if err != nil {
 		return err
 	}
@@ -75,16 +79,36 @@ func (api *HttpDagServ) Add(ctx context.Context, nd format.Node) error {
 	return nil
 }
 
-func (api *HttpDagServ) AddMany(ctx context.Context, nds []format.Node) error {
+func (api *httpNodeAdder) addMany(ctx context.Context, nds []format.Node, pin bool) error {
 	for _, nd := range nds {
 		// TODO: optimize
-		if err := api.Add(ctx, nd); err != nil {
+		if err := api.add(ctx, nd, pin); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
+func (api *HttpDagServ) AddMany(ctx context.Context, nds []format.Node) error {
+	return (*httpNodeAdder)(api).addMany(ctx, nds, false)
+}
+
+func (api *HttpDagServ) Add(ctx context.Context, nd format.Node) error {
+	return (*httpNodeAdder)(api).add(ctx, nd, false)
+}
+
+func (api *pinningHttpNodeAdder) Add(ctx context.Context, nd format.Node) error {
+	return (*httpNodeAdder)(api).add(ctx, nd, true)
+}
+
+func (api *pinningHttpNodeAdder) AddMany(ctx context.Context, nds []format.Node) error {
+	return (*httpNodeAdder)(api).addMany(ctx, nds, true)
+}
+
+func (api *HttpDagServ) Pinning() format.NodeAdder {
+	return (*pinningHttpNodeAdder)(api)
+}
+
 func (api *HttpDagServ) Remove(ctx context.Context, c cid.Cid) error {
 	return api.core().Block().Rm(ctx, iface.IpldPath(c)) //TODO: should we force rm?
 }
@@ -99,6 +123,10 @@ func (api *HttpDagServ) RemoveMany(ctx context.Context, cids []cid.Cid) error {
 	return nil
 }
 
+func (api *httpNodeAdder) core() *HttpApi {
+	return (*HttpApi)(api)
+}
+
 func (api *HttpDagServ) core() *HttpApi {
 	return (*HttpApi)(api)
 }