Merge pull request #4315 from justinsb/clarify_readtree

ReadTree: clarify that returns only files

upup/pkg/fi/vfs_castore_test.go

@@ -81,9 +81,6 @@ func TestVFSCAStoreRoundTrip(t *testing.T) {
 
 	pathMap := make(map[string]vfs.Path)
 	for _, p := range paths {
-		if p.(*vfs.MemFSPath).HasChildren() {
-			continue
-		}
 		pathMap[p.Path()] = p
 	}
 

util/pkg/vfs/fs.go

@@ -152,19 +152,22 @@ func (p *FSPath) ReadTree() ([]Path, error) {
 	return paths, nil
 }
 
+// readTree recursively finds files and adds them to dest
+// It excludes directories.
 func readTree(base string, dest *[]Path) error {
 	files, err := ioutil.ReadDir(base)
 	if err != nil {
 		return err
 	}
 	for _, f := range files {
 		p := path.Join(base, f.Name())
-		*dest = append(*dest, NewFSPath(p))
 		if f.IsDir() {
 			err = readTree(p, dest)
 			if err != nil {
 				return err
 			}
+		} else {
+			*dest = append(*dest, NewFSPath(p))
 		}
 	}
 	return nil

util/pkg/vfs/memfs.go

@@ -140,7 +140,9 @@ func (p *MemFSPath) ReadTree() ([]Path, error) {
 
 func (p *MemFSPath) readTree(dest *[]Path) {
 	for _, f := range p.children {
-		*dest = append(*dest, f)
+		if !f.HasChildren() {
+			*dest = append(*dest, f)
+		}
 		f.readTree(dest)
 	}
 }

util/pkg/vfs/vfs.go

@@ -69,6 +69,7 @@ type Path interface {
 	ReadDir() ([]Path, error)
 
 	// ReadTree lists all files (recursively) in the subtree rooted at the current Path
+	/// Note: returns only files, not directories
 	ReadTree() ([]Path, error)
 }