coreapi: remove hidden file handling in add

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

core/commands/add.go

@@ -12,7 +12,8 @@ import (
 	cmdkit "github.com/ipfs/go-ipfs-cmdkit"
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/go-ipfs-files"
 	mh "github.com/multiformats/go-multihash"
 	pb "gopkg.in/cheggaaa/pb.v1"
 )
@@ -160,7 +161,7 @@ You can now check what blocks have been created by:
 		trickle, _ := req.Options[trickleOptionName].(bool)
 		wrap, _ := req.Options[wrapOptionName].(bool)
 		hash, _ := req.Options[onlyHashOptionName].(bool)
-		hidden, _ := req.Options[hiddenOptionName].(bool)
+		//hidden, _ := req.Options[hiddenOptionName].(bool)
 		silent, _ := req.Options[silentOptionName].(bool)
 		chunker, _ := req.Options[chunkerOptionName].(string)
 		dopin, _ := req.Options[pinOptionName].(bool)
@@ -186,7 +187,6 @@ You can now check what blocks have been created by:
 		events := make(chan interface{}, adderOutChanSize)
 
 		var toadd files.Node = req.Files
-		addName := ""
 		if !wrap {
 			it := req.Files.Entries()
 			if !it.Next() {
@@ -197,7 +197,6 @@ You can now check what blocks have been created by:
 				return err
 			}
 
-			addName = it.Name()
 			toadd = it.Node()
 		}
 
@@ -214,13 +213,11 @@ You can now check what blocks have been created by:
 			options.Unixfs.FsCache(fscache),
 			options.Unixfs.Nocopy(nocopy),
 
-			options.Unixfs.Hidden(hidden),
 			options.Unixfs.StdinName(pathName),
 
 			options.Unixfs.Progress(progress),
 			options.Unixfs.Silent(silent),
 			options.Unixfs.Events(events),
-			options.Unixfs.BaseName(addName),
 		}
 
 		if cidVerSet {

core/coreapi/unixfs.go

@@ -87,16 +87,13 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
 		fileAdder.Out = settings.Events
 		fileAdder.Progress = settings.Progress
 	}
-	fileAdder.Hidden = settings.Hidden
 	fileAdder.Wrap = settings.Wrap
 	fileAdder.Pin = settings.Pin && !settings.OnlyHash
 	fileAdder.Silent = settings.Silent
 	fileAdder.RawLeaves = settings.RawLeaves
 	fileAdder.NoCopy = settings.NoCopy
 	fileAdder.Name = settings.StdinName
-	fileAdder.BaseName = settings.BaseName
 	fileAdder.CidBuilder = prefix
-	fileAdder.TopHidden = settings.TopHidden
 
 	switch settings.Layout {
 	case options.BalancedLayout:

core/corehttp/gateway_test.go

@@ -22,7 +22,6 @@ import (
 	files "github.com/ipfs/go-ipfs-files"
 	path "github.com/ipfs/go-path"
 	iface "github.com/ipfs/interface-go-ipfs-core"
-	"github.com/ipfs/interface-go-ipfs-core/options"
 	nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
 	ci "github.com/libp2p/go-libp2p-crypto"
 	id "github.com/libp2p/go-libp2p/p2p/protocol/identify"

core/coreunix/add.go

@@ -50,7 +50,6 @@ func NewAdder(ctx context.Context, p pin.Pinner, bs bstore.GCLocker, ds ipld.DAG
 		dagService: ds,
 		bufferedDS: bufferedDS,
 		Progress:   false,
-		Hidden:     true,
 		Pin:        true,
 		Trickle:    false,
 		Wrap:       false,
@@ -67,15 +66,12 @@ type Adder struct {
 	bufferedDS *ipld.BufferedDAG
 	Out        chan<- interface{}
 	Progress   bool
-	Hidden     bool
-	TopHidden  bool
 	Pin        bool
 	Trickle    bool
 	RawLeaves  bool
 	Silent     bool
 	Wrap       bool
 	Name       string
-	BaseName   string
 	NoCopy     bool
 	Chunker    string
 	root       ipld.Node
@@ -231,9 +227,6 @@ func (adder *Adder) outputDirs(path string, fsn mfs.FSNode) error {
 
 func (adder *Adder) addNode(node ipld.Node, path string) error {
 	// patch it into the root
-	if adder.BaseName != "" {
-		path = gopath.Join(adder.BaseName, path)
-	}
 	if path == "" {
 		path = node.Cid().String()
 	}
@@ -280,7 +273,7 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
 	}()
 
 	d, dir := file.(files.Directory)
-	if !dir || !adder.TopHidden {
+	if !dir {
 		d = files.NewSliceDirectory([]files.DirEntry{
 			files.FileEntry("", file),
 		})
@@ -355,7 +348,7 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
 			return nil, err
 		}
 
-		if err := outputDagnode(adder.Out, adder.BaseName, nd); err != nil {
+		if err := outputDagnode(adder.Out, "", nd); err != nil {
 			return nil, err
 		}
 	}
@@ -473,12 +466,6 @@ func (adder *Adder) addDir(path string, dir files.Directory, toplevel bool) erro
 	it := dir.Entries()
 	for it.Next() {
 		fpath := gopath.Join(path, it.Name())
-
-		// Skip hidden files when adding recursively, unless Hidden is enabled.
-		if files.IsHidden(fpath, it.Node()) && !adder.Hidden {
-			log.Infof("%s is hidden, skipping", fpath)
-			continue
-		}
 		err := adder.addFileNode(fpath, it.Node(), false)
 		if err != nil {
 			return err