Force-enable wrap-in-directory

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>

adder/adder.go

@@ -97,13 +97,15 @@ func (a *Adder) FromFiles(ctx context.Context, f files.File) (*cid.Cid, error) {
 
 	ipfsAdder, err := ipfsadd.NewAdder(a.ctx, a.dags)
 	if err != nil {
+		logger.Error(err)
 		return nil, err
 	}
 
 	ipfsAdder.Hidden = a.params.Hidden
 	ipfsAdder.Trickle = a.params.Layout == "trickle"
 	ipfsAdder.RawLeaves = a.params.RawLeaves
-	ipfsAdder.Wrap = a.params.Wrap
+	ipfsAdder.Wrap = true // FIXME: adding fails when !wrap( see ipfsadd.go)
+	//ipfsAdder.Wrap = a.params.Wrap
 	ipfsAdder.Chunker = a.params.Chunker
 	ipfsAdder.Out = a.output
 

ipfs-cluster-ctl/main.go

@@ -284,10 +284,10 @@ automatically generated.
 					Value: defaultAddParams.Layout,
 					Usage: "Dag layout to use for dag generation: balanced or trickle",
 				},
-				cli.BoolFlag{
-					Name:  "wrap-with-directory, w",
-					Usage: "Wrap files with a directory object",
-				},
+				// 				cli.BoolFlag{
+				// 					Name:  "wrap-with-directory, w",
+				// g					Usage: "Wrap files with a directory object",
+				// 				},
 				cli.BoolFlag{
 					Name:  "hidden, H",
 					Usage: "Include files that are hidden.  Only takes effect on recursive add",
@@ -368,7 +368,8 @@ automatically generated.
 				p.Chunker = c.String("chunker")
 				p.RawLeaves = c.Bool("raw-leaves")
 				p.Hidden = c.Bool("hidden")
-				p.Wrap = c.Bool("wrap-with-directory") || len(paths) > 1
+				//p.Wrap = c.Bool("wrap-with-directory") || len(paths) > 1
+				p.Wrap = true
 
 				out := make(chan *api.AddedOutput, 1)
 				var wg sync.WaitGroup