[WIP] Towards Issue #875, avoid duplicating files added to ipfs

Makefile

@@ -7,8 +7,6 @@ endif
 
 COMMIT := $(shell git rev-parse --short HEAD)
 ldflags = "-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(COMMIT)"
-MAKEFLAGS += --no-print-directory
-
 
 export IPFS_API ?= v04x.ipfs.io
 
@@ -45,19 +43,19 @@ vendor: godep
 	godep save -r ./...
 
 install: deps
-	cd cmd/ipfs && go install -ldflags=$(ldflags)
+	make -C cmd/ipfs install
 
 build: deps
-	cd cmd/ipfs && go build -i -ldflags=$(ldflags)
+	make -C cmd/ipfs build
 
 nofuse: deps
-	cd cmd/ipfs && go install -tags nofuse -ldflags=$(ldflags)
+	make -C cmd/ipfs nofuse
 
 clean:
-	cd cmd/ipfs && go clean -ldflags=$(ldflags)
+	make -C cmd/ipfs clean
 
 uninstall:
-	cd cmd/ipfs && go clean -i -ldflags=$(ldflags)
+	make -C cmd/ipfs uninstall
 
 PHONY += all help godep toolkit_upgrade gx_upgrade gxgo_upgrade gx_check
 PHONY += go_check deps vendor install build nofuse clean uninstall

blocks/blocks.go

@@ -12,39 +12,69 @@ import (
 )
 
 // Block is a singular block of data in ipfs
-type Block struct {
-	Multihash mh.Multihash
-	Data      []byte
+type Block interface {
+	Multihash() mh.Multihash
+	Data() []byte
+	Key() key.Key
+	String() string
+	Loggable() map[string]interface{}
+}
+
+type BasicBlock struct {
+	multihash mh.Multihash
+	data      []byte
+}
+
+type FilestoreBlock struct {
+	BasicBlock
+	*DataPtr
+	AddOpts interface{}
+}
+
+// This DataPtr had different AltData than the node DataPtr
+type DataPtr struct {
+	AltData  []byte
+	FilePath string
+	Offset   uint64
+	Size     uint64
 }
 
 // NewBlock creates a Block object from opaque data. It will hash the data.
-func NewBlock(data []byte) *Block {
-	return &Block{Data: data, Multihash: u.Hash(data)}
+func NewBlock(data []byte) *BasicBlock {
+	return &BasicBlock{data: data, multihash: u.Hash(data)}
 }
 
 // NewBlockWithHash creates a new block when the hash of the data
 // is already known, this is used to save time in situations where
 // we are able to be confident that the data is correct
-func NewBlockWithHash(data []byte, h mh.Multihash) (*Block, error) {
+func NewBlockWithHash(data []byte, h mh.Multihash) (*BasicBlock, error) {
 	if u.Debug {
 		chk := u.Hash(data)
 		if string(chk) != string(h) {
 			return nil, errors.New("Data did not match given hash!")
 		}
 	}
-	return &Block{Data: data, Multihash: h}, nil
+	return &BasicBlock{data: data, multihash: h}, nil
+}
+
+func (b *BasicBlock) Multihash() mh.Multihash {
+	return b.multihash
+}
+
+func (b *BasicBlock) Data() []byte {
+	return b.data
 }
 
 // Key returns the block's Multihash as a Key value.
-func (b *Block) Key() key.Key {
-	return key.Key(b.Multihash)
+func (b *BasicBlock) Key() key.Key {
+	return key.Key(b.multihash)
 }
 
-func (b *Block) String() string {
+func (b *BasicBlock) String() string {
 	return fmt.Sprintf("[Block %s]", b.Key())
 }
 
-func (b *Block) Loggable() map[string]interface{} {
+func (b *BasicBlock) Loggable() map[string]interface{} {
 	return map[string]interface{}{
 		"block": b.Key().String(),
 	}