proper directory listing with types

Author: whyrusleeping

fuse/ipns/ipns_unix.go

@@ -278,7 +278,22 @@ func (s *Directory) Lookup(ctx context.Context, name string) (fs.Node, error) {
 func (dir *Directory) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	var entries []fuse.Dirent
 	for _, name := range dir.dir.List() {
-		entries = append(entries, fuse.Dirent{Name: name, Type: fuse.DT_File})
+		dirent := fuse.Dirent{Name: name}
+
+		// TODO: make dir.dir.List() return dirinfos
+		child, err := dir.dir.Child(name)
+		if err != nil {
+			return nil, err
+		}
+
+		switch child.Type() {
+		case nsfs.TDir:
+			dirent.Type = fuse.DT_Dir
+		case nsfs.TFile:
+			dirent.Type = fuse.DT_File
+		}
+
+		entries = append(entries, dirent)
 	}
 
 	if len(entries) > 0 {

ipnsfs/dir.go

@@ -105,6 +105,10 @@ func (d *Directory) closeChild(name string) error {
 	return d.parent.closeChild(d.name)
 }
 
+func (d *Directory) Type() NodeType {
+	return TDir
+}
+
 func (d *Directory) childFile(name string) (*file, error) {
 	fi, ok := d.files[name]
 	if ok {

ipnsfs/file.go

@@ -19,8 +19,8 @@ type File interface {
 	Seek(int64, int) (int64, error)
 	Size() (int64, error)
 	Flush() error
-	GetNode() (*dag.Node, error)
 	Truncate(int64) error
+	FSNode
 }
 
 type file struct {
@@ -107,6 +107,10 @@ func (fi *file) Truncate(size int64) error {
 	return fi.mod.Truncate(size)
 }
 
+func (fi *file) Type() NodeType {
+	return TFile
+}
+
 type readOnlyFile struct {
 	*file
 }

ipnsfs/system.go

@@ -86,8 +86,16 @@ func (fs *Filesystem) GetRoot(name string) (*KeyRoot, error) {
 	return nil, ErrNoSuch
 }
 
+type NodeType int
+
+const (
+	TFile NodeType = iota
+	TDir
+)
+
 type FSNode interface {
 	GetNode() (*dag.Node, error)
+	Type() NodeType
 }
 
 // KeyRoot represents the root of a filesystem tree pointed to by a given keypair