drop wrap check and modify parameter name

License: MIT
Signed-off-by: Kejie Zhang <601172892@qq.com>

core/commands/add.go

@@ -37,7 +37,7 @@ const (
 	progressOptionName    = "progress"
 	trickleOptionName     = "trickle"
 	wrapOptionName        = "wrap-with-directory"
-	wrapPathName          = "name"
+	pathName              = "name"
 	hiddenOptionName      = "hidden"
 	onlyHashOptionName    = "only-hash"
 	chunkerOptionName     = "chunker"
@@ -117,7 +117,7 @@ You can now check what blocks have been created by:
 		cmdkit.BoolOption(trickleOptionName, "t", "Use trickle-dag format for dag generation."),
 		cmdkit.BoolOption(onlyHashOptionName, "n", "Only chunk and hash - do not write to disk."),
 		cmdkit.BoolOption(wrapOptionName, "w", "Wrap files with a directory object."),
-		cmdkit.StringOption(wrapPathName, "Assign path name when use wrap-with-directory option"),
+		cmdkit.StringOption(pathName, "Assign path name when use wrap-with-directory option"),
 		cmdkit.BoolOption(hiddenOptionName, "H", "Include files that are hidden. Only takes effect on recursive add."),
 		cmdkit.StringOption(chunkerOptionName, "s", "Chunking algorithm, size-[bytes] or rabin-[min]-[avg]-[max]").WithDefault("size-262144"),
 		cmdkit.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true),
@@ -183,7 +183,7 @@ You can now check what blocks have been created by:
 		hashFunStr, _ := req.Options[hashOptionName].(string)
 		inline, _ := req.Options[inlineOptionName].(bool)
 		inlineLimit, _ := req.Options[inlineLimitOptionName].(int)
-		wrapPathName, _ := req.Options[wrapPathName].(string)
+		pathName, _ := req.Options[pathName].(string)
 
 		// The arguments are subject to the following constraints.
 		//
@@ -290,7 +290,7 @@ You can now check what blocks have been created by:
 		fileAdder.Silent = silent
 		fileAdder.RawLeaves = rawblks
 		fileAdder.NoCopy = nocopy
-		fileAdder.WpName = wrapPathName
+		fileAdder.Name = pathName
 		fileAdder.CidBuilder = prefix
 
 		if inline {

core/coreunix/add.go

@@ -26,7 +26,6 @@ import (
 	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 	bstore "gx/ipfs/QmcmpX42gtDv1fz24kau4wjS9hfwWj5VexWBKgGnWzsyag/go-ipfs-blockstore"
 	mfs "gx/ipfs/QmdghKsSDa2AD1kC4qYRnVYWqZecdSBRZjeXRdhMYYhafj/go-mfs"
-	"strings"
 )
 
 var log = logging.Logger("coreunix")
@@ -84,7 +83,7 @@ type Adder struct {
 	RawLeaves  bool
 	Silent     bool
 	Wrap       bool
-	WpName     string
+	Name       string
 	NoCopy     bool
 	Chunker    string
 	root       ipld.Node
@@ -472,11 +471,13 @@ func (adder *Adder) addFile(file files.File) error {
 		return err
 	}
 
-	if !strings.EqualFold(adder.WpName, "") && adder.Wrap {
-		return adder.addNode(dagnode, adder.WpName)
+	addFileName := file.FileName()
+	if addFileName == "" && adder.Name != "" {
+		addFileName = adder.Name
+		adder.Name = ""
 	}
 	// patch it into the root
-	return adder.addNode(dagnode, file.FileName())
+	return adder.addNode(dagnode, addFileName)
 }
 
 func (adder *Adder) addDir(dir files.File) error {