From 7b62d1ab5bc07fe15130de9d0ccea754b1e9fc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 2 Nov 2020 21:13:32 +0100
Subject: [PATCH] Remove redundant Dir prefixes.

---
 dir/dir.go | 38 +++++++++++++++++++-------------------
 main.go    |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dir/dir.go b/dir/dir.go
index 8d0badc..641e4ad 100644
--- a/dir/dir.go
+++ b/dir/dir.go
@@ -11,52 +11,52 @@ import (
 	"syscall"
 )
 
-type DirRoot struct{}
-type DirHostList struct{}
-type DirHost struct{ hostname string }
-type DirHostClasses struct{ hostname string }
+type Root struct{}
+type HostList struct{}
+type Host struct{ hostname string }
+type HostClasses struct{ hostname string }
 
-func (DirRoot) Attr(ctx context.Context, a *fuse.Attr) error {
+func (Root) Attr(ctx context.Context, a *fuse.Attr) error {
 	a.Inode = 0
 	a.Mode = os.ModeDir | 0o555
 	return nil
 }
 
-func (DirHostList) Attr(ctx context.Context, a *fuse.Attr) error {
+func (HostList) Attr(ctx context.Context, a *fuse.Attr) error {
 	a.Inode = 0
 	a.Mode = os.ModeDir | 0o555
 	return nil
 }
 
-func (DirHost) Attr(ctx context.Context, a *fuse.Attr) error {
+func (Host) Attr(ctx context.Context, a *fuse.Attr) error {
 	a.Inode = 0
 	a.Mode = os.ModeDir | 0o555
 	return nil
 }
 
-func (DirHostClasses) Attr(ctx context.Context, a *fuse.Attr) error {
+func (HostClasses) Attr(ctx context.Context, a *fuse.Attr) error {
 	a.Inode = 0
 	a.Mode = os.ModeDir | 0o555
 	return nil
 }
 
-func (DirRoot) Lookup(ctx context.Context, name string) (fs.Node, error) {
+func (Root) Lookup(ctx context.Context, name string) (fs.Node, error) {
 	if name == "hosts" {
-		return DirHostList{}, nil
+		return HostList{}, nil
 	} else {
 		return nil, syscall.ENOENT
 	}
 }
 
-func (DirHostList) Lookup(ctx context.Context, name string) (fs.Node, error) {
+func (HostList) Lookup(ctx context.Context, name string) (fs.Node, error) {
 	_, ok := fetch.Hosts[name]
 	if !ok {
 		return nil, syscall.ENOENT
 	}
-	return DirHost{name}, nil
+	return Host{name}, nil
 }
 
-func (d DirHostClasses) Lookup(ctx context.Context, name string) (fs.Node, error) {
+func (d HostClasses) Lookup(ctx context.Context, name string) (fs.Node, error) {
 	classes := fetch.GetClassList(fetch.Hosts[d.hostname].Data)
 
 	for _, class := range classes {
@@ -68,21 +68,21 @@ func (d DirHostClasses) Lookup(ctx context.Context, name string) (fs.Node, error
 	return nil, syscall.ENOENT
 }
 
-func (d DirHost) Lookup(ctx context.Context, name string) (fs.Node, error) {
+func (d Host) Lookup(ctx context.Context, name string) (fs.Node, error) {
 	switch name {
 	case "data":
 		return file.DataFile{d.hostname}, nil
 	case "classes":
-		return DirHostClasses{d.hostname}, nil
+		return HostClasses{d.hostname}, nil
 	}
 	return nil, syscall.ENOENT
 }
 
-func (DirRoot) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+func (Root) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	return []fuse.Dirent{{Inode: 0, Name: "hosts", Type: fuse.DT_Dir}}, nil
 }
 
-func (DirHostList) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+func (HostList) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	var dirents []fuse.Dirent
 	for _, item := range fetch.Hosts {
 		dirents = append(dirents, fuse.Dirent{Inode: 0, Name: item.Data.Name, Type: fuse.DT_Dir})
@@ -90,14 +90,14 @@ func (DirHostList) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	return dirents, nil
 }
 
-func (DirHost) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+func (Host) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	return []fuse.Dirent{
 		{Inode: 0, Name: "data", Type: fuse.DT_File},
 		{Inode: 0, Name: "classes", Type: fuse.DT_Dir},
 	}, nil
 }
 
-func (d DirHostClasses) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+func (d HostClasses) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 	classes := fetch.GetClassList(fetch.Hosts[d.hostname].Data)
 
 	var out []fuse.Dirent
diff --git a/main.go b/main.go
index ad5cf1d..35d0e92 100644
--- a/main.go
+++ b/main.go
@@ -39,5 +39,5 @@ type FS struct{}
 
 func (fs FS) Root() (fs.Node, error) {
 	// return Dir{   /*fs.data*/ }, nil
-	return dir.DirHostList{ /*fs.data*/ }, nil
+	return dir.HostList{ /*fs.data*/ }, nil
 }
-- 
GitLab