Merge pull request #2531 from noffle/output-dirs-on-add

Outputs added directories as they are traversed.

core/commands/add.go

@@ -183,16 +183,16 @@ You can now refer to the added file in a gateway, like so:
 				}
 			}
 
-			if hash {
-				return nil
-			}
-
 			// copy intermediary nodes from editor to our actual dagservice
 			_, err := fileAdder.Finalize()
 			if err != nil {
 				return err
 			}
 
+			if hash {
+				return nil
+			}
+
 			return fileAdder.PinRoot()
 		}
 

core/coreunix/add.go

@@ -174,20 +174,27 @@ func (adder *Adder) PinRoot() error {
 }
 
 func (adder *Adder) Finalize() (*dag.Node, error) {
+	root := adder.mr.GetValue()
+
 	// cant just call adder.RootNode() here as we need the name for printing
-	root, err := adder.mr.GetValue().GetNode()
+	rootNode, err := root.GetNode()
 	if err != nil {
 		return nil, err
 	}
 
 	var name string
 	if !adder.Wrap {
-		name = root.Links[0].Name
-		child, err := root.Links[0].GetNode(adder.ctx, adder.node.DAG)
+		name = rootNode.Links[0].Name
+
+		dir, ok := adder.mr.GetValue().(*mfs.Directory)
+		if !ok {
+			return nil, fmt.Errorf("root is not a directory")
+		}
+
+		root, err = dir.Child(name)
 		if err != nil {
 			return nil, err
 		}
-		root = child
 	}
 
 	err = adder.outputDirs(name, root)
@@ -200,21 +207,31 @@ func (adder *Adder) Finalize() (*dag.Node, error) {
 		return nil, err
 	}
 
-	return root, nil
+	return root.GetNode()
 }
 
-func (adder *Adder) outputDirs(path string, nd *dag.Node) error {
-	if !bytes.Equal(nd.Data, folderData) {
+func (adder *Adder) outputDirs(path string, fs mfs.FSNode) error {
+	nd, err := fs.GetNode()
+	if err != nil {
+		return err
+	}
+
+	if !bytes.Equal(nd.Data, folderData) || fs.Type() != mfs.TDir {
 		return nil
 	}
 
-	for _, l := range nd.Links {
-		child, err := l.GetNode(adder.ctx, adder.node.DAG)
+	dir, ok := fs.(*mfs.Directory)
+	if !ok {
+		return fmt.Errorf("received FSNode of type TDir that was not a Directory")
+	}
+
+	for _, name := range dir.ListNames() {
+		child, err := dir.Child(name)
 		if err != nil {
 			return err
 		}
 
-		err = adder.outputDirs(gopath.Join(path, l.Name), child)
+		err = adder.outputDirs(gopath.Join(path, name), child)
 		if err != nil {
 			return err
 		}

mfs/dir.go

@@ -116,6 +116,11 @@ func (d *Directory) childNode(name string) (FSNode, error) {
 		return nil, err
 	}
 
+	return d.cacheNode(name, nd)
+}
+
+// cacheNode caches a node into d.childDirs or d.files and returns the FSNode.
+func (d *Directory) cacheNode(name string, nd *dag.Node) (FSNode, error) {
 	i, err := ft.FromBytes(nd.Data)
 	if err != nil {
 		return nil, err
@@ -334,6 +339,17 @@ func (d *Directory) AddChild(name string, nd *dag.Node) error {
 
 	d.modTime = time.Now()
 
+	if len(nd.Links) == 0 {
+		nfi, err := NewFile(name, nd, d, d.dserv)
+		if err != nil {
+			return err
+		}
+		d.files[name] = nfi
+	} else {
+		ndir := NewDirectory(d.ctx, name, nd, d, d.dserv)
+		d.childDirs[name] = ndir
+	}
+
 	return nil
 }
 

mfs/ops.go

@@ -102,7 +102,7 @@ func PutNode(r *Root, path string, nd *dag.Node) error {
 // intermediary directories as needed if 'mkparents' is set to true
 func Mkdir(r *Root, pth string, mkparents bool, flush bool) error {
 	if pth == "" {
-		return nil
+		return fmt.Errorf("no path given to Mkdir")
 	}
 	parts := path.SplitList(pth)
 	if parts[0] == "" {

test/sharness/t0040-add-and-cat.sh

@@ -285,6 +285,31 @@ test_expect_success "'ipfs add -r' output looks good" '
 	test_cmp expected actual
 '
 
+test_expect_success "'ipfs add -rn' succeeds" '
+	mkdir -p mountdir/moons/jupiter &&
+	mkdir -p mountdir/moons/saturn &&
+	echo "Hello Europa!" >mountdir/moons/jupiter/europa.txt &&
+	echo "Hello Titan!" >mountdir/moons/saturn/titan.txt &&
+	echo "hey youre no moon!" >mountdir/moons/mercury.txt &&
+	ipfs add -rn mountdir/moons >actual
+'
+
+test_expect_success "'ipfs add -rn' output looks good" '
+	MOONS="QmVKvomp91nMih5j6hYBA8KjbiaYvEetU2Q7KvtZkLe9nQ" &&
+	EUROPA="Qmbjg7zWdqdMaK2BucPncJQDxiALExph5k3NkQv5RHpccu" &&
+  JUPITER="QmS5mZddhFPLWFX3w6FzAy9QxyYkaxvUpsWCtZ3r7jub9J" &&
+  SATURN="QmaMagZT4rTE7Nonw8KGSK4oe1bh533yhZrCo1HihSG8FK" &&
+	TITAN="QmZzppb9WHn552rmRqpPfgU5FEiHH6gDwi3MrB9cTdPwdb" &&
+	MERCURY="QmUJjVtnN8YEeYcS8VmUeWffTWhnMQAkk5DzZdKnPhqUdK" &&
+  echo "added $EUROPA moons/jupiter/europa.txt" >expected &&
+  echo "added $MERCURY moons/mercury.txt" >>expected &&
+  echo "added $TITAN moons/saturn/titan.txt" >>expected &&
+  echo "added $JUPITER moons/jupiter" >>expected &&
+  echo "added $SATURN moons/saturn" >>expected &&
+  echo "added $MOONS moons" >>expected &&
+	test_cmp expected actual
+'
+
 test_expect_success "ipfs cat accept many hashes from stdin" '
 	{ echo "$MARS"; echo "$VENUS"; } | ipfs cat >actual
 '