files2.0: refactored helpers

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
ipfs · Dec 13, 2018 · 53efd96 · 53efd96
1 parent d7983ed
commit 53efd96
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 86 deletions.
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
@@ -17,9 +17,9 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
 	"gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	"gx/ipfs/QmYyzmMnhNTtoXx5ttgUaRdHHckYnQWjPL98hgLAR2QLDD/go-ipfs-config"
 	"gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	"gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 )
 
 const (
@@ -90,12 +90,12 @@ environment variable:
 			if !it.Next() && it.Err() != nil {
 				return it.Err()
 			}
-			if files.FileFrom(it) == nil {
+			if files.FileFromEntry(it) == nil {
 				return fmt.Errorf("expected a regular file")
 			}
 
 			conf = &config.Config{}
-			if err := json.NewDecoder(files.FileFrom(it)).Decode(conf); err != nil {
+			if err := json.NewDecoder(files.FileFromEntry(it)).Decode(conf); err != nil {
 				return err
 			}
 		}

diff --git a/core/commands/block.go b/core/commands/block.go
@@ -12,8 +12,8 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
@@ -158,7 +158,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
@@ -182,7 +182,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
 			}
 		}
 
-		p, err := api.Block().Put(req.Context, files.FileFrom(it), options.Block.Hash(mhtval, mhlen), options.Block.Format(format))
+		p, err := api.Block().Put(req.Context, files.FileFromEntry(it), options.Block.Hash(mhtval, mhlen), options.Block.Format(format))
 		if err != nil {
 			return err
 		}

diff --git a/core/commands/config.go b/core/commands/config.go
@@ -16,9 +16,9 @@ import (
 
 	"gx/ipfs/QmP2i47tnU23ijdshrZtuvrSkQPtf9HhsMb9fwGVe8owj2/jsondiff"
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	config "gx/ipfs/QmYyzmMnhNTtoXx5ttgUaRdHHckYnQWjPL98hgLAR2QLDD/go-ipfs-config"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 )
 
 // ConfigUpdateOutput is config profile apply command's output
@@ -285,10 +285,10 @@ can't be undone.
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
-		file := files.FileFrom(it)
+		file := files.FileFromEntry(it)
 		defer file.Close()
 
 		return replaceConfig(r, file)

diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go
@@ -11,10 +11,10 @@ import (
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	path "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
@@ -95,10 +95,10 @@ into an object of the specified format.
 
 		it := req.Files.Entries()
 		for it.Next() {
-			if files.FileFrom(it) == nil {
+			if files.FileFromEntry(it) == nil {
 				return fmt.Errorf("expected a regular file")
 			}
-			nds, err := coredag.ParseInputs(ienc, format, files.FileFrom(it), mhType, -1)
+			nds, err := coredag.ParseInputs(ienc, format, files.FileFromEntry(it), mhType, -1)
 			if err != nil {
 				return err
 			}

diff --git a/core/commands/files.go b/core/commands/files.go
@@ -19,13 +19,13 @@ import (
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	mfs "gx/ipfs/QmU3iDRUrxyTYdV2j5MuWLFvP1k7w98vD66PLnNChgvUmZ/go-mfs"
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	offline "gx/ipfs/QmYZwey1thDTynSrvd6qQkX24UpTka6TFhQ2v569UpoqxD/go-ipfs-exchange-offline"
 	ft "gx/ipfs/Qmbvw7kpSM2p6rbQ57WGRhhqNfCiNGW6EKH4xgHLw4bsnB/go-unixfs"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 	logging "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log"
 	dag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
@@ -774,11 +774,11 @@ stat' on the file or any of its ancestors.
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
-		var r io.Reader = files.FileFrom(it)
+		var r io.Reader = files.FileFromEntry(it)
 		if countfound {
 			r = io.LimitReader(r, int64(count))
 		}

diff --git a/core/commands/object/object.go b/core/commands/object/object.go
@@ -14,10 +14,10 @@ import (
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 	dag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 )
 
 type Node struct {
@@ -396,7 +396,7 @@ And then run:
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
@@ -415,7 +415,7 @@ And then run:
 			return err
 		}
 
-		p, err := api.Object().Put(req.Context, files.FileFrom(it),
+		p, err := api.Object().Put(req.Context, files.FileFromEntry(it),
 			options.Object.DataType(datafieldenc),
 			options.Object.InputEnc(inputenc),
 			options.Object.Pin(dopin))

diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go
@@ -9,8 +9,8 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	"gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	"gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	"gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 )
 
 var ObjectPatchCmd = &cmds.Command{
@@ -65,11 +65,11 @@ the limit will not be respected by the network.
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
-		p, err := api.Object().AppendData(req.Context, root, files.FileFrom(it))
+		p, err := api.Object().AppendData(req.Context, root, files.FileFromEntry(it))
 		if err != nil {
 			return err
 		}
@@ -115,11 +115,11 @@ Example:
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
-		p, err := api.Object().SetData(req.Context, root, files.FileFrom(it))
+		p, err := api.Object().SetData(req.Context, root, files.FileFromEntry(it))
 		if err != nil {
 			return err
 		}

diff --git a/core/commands/tar.go b/core/commands/tar.go
@@ -10,10 +10,10 @@ import (
 	tar "github.com/ipfs/go-ipfs/tar"
 
 	cmds "gx/ipfs/QmVNHQrQHgDMkiBUPSVV1jT1Lt1PE29r2JxXyqpgk5nndk/go-ipfs-cmds"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	"gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 	dag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
-	files "gx/ipfs/QmeaQRmnRog7NxLEWHP9zSTkics4cbgwBVa7q49LmBowDr/go-ipfs-files"
 )
 
 var TarCmd = &cmds.Command{
@@ -49,11 +49,11 @@ represent it.
 		if !it.Next() && it.Err() != nil {
 			return it.Err()
 		}
-		if files.FileFrom(it) == nil {
+		if files.FileFromEntry(it) == nil {
 			return fmt.Errorf("expected a regular file")
 		}
 
-		node, err := tar.ImportTar(req.Context, files.FileFrom(it), nd.DAG)
+		node, err := tar.ImportTar(req.Context, files.FileFromEntry(it), nd.DAG)
 		if err != nil {
 			return err
 		}

diff --git a/core/coreapi/name_test.go b/core/coreapi/name_test.go
@@ -19,7 +19,7 @@ import (
 var rnd = rand.New(rand.NewSource(0x62796532303137))
 
 func addTestObject(ctx context.Context, api coreiface.CoreAPI) (coreiface.Path, error) {
-	return api.Unixfs().Add(ctx, files.FileFrom(&io.LimitedReader{R: rnd, N: 4092}))
+	return api.Unixfs().Add(ctx, files.NewReaderFile(&io.LimitedReader{R: rnd, N: 4092}))
 }
 
 func appendPath(p coreiface.Path, sub string) coreiface.Path {