added directory cleanup

cmd/cachefs/main.go

@@ -88,4 +88,5 @@ func main() {
 	}
 	filesystem.Close()
 	log.Info("cachefs shutdown completed")
+	os.Exit(0)
 }

pkg/fs/dir.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"sync"
 	"time"
+
+	"github.com/go-logr/logr"
 )
 
 var NoCacheEntry = errors.New("no cache entry")
@@ -42,8 +44,9 @@ func (dc *DirCache) Set(name string, dce *DirCacheEntry) {
 }
 
 type Dir struct {
-	f  *os.File
+	log logr.Logger
-	dc *DirCache
+	f   *os.File
+	dc  *DirCache
 }
 
 func (f *Dir) Read(_ []byte) (int, error) {
@@ -54,6 +57,19 @@ func (f *Dir) Seek(_ int64, _ int) (int64, error) {
 	return 0, io.EOF
 }
 
+func readDir(f *os.File) (fi []os.FileInfo, err error) {
+	ent, err := f.ReadDir(0)
+	if err != nil {
+		return
+	}
+	fi = make([]os.FileInfo, len(ent))
+	for j, e := range ent {
+		i, _ := e.Info()
+		fi[j] = i
+	}
+	return
+}
+
 func (f *Dir) Readdir(_ int) (fi []os.FileInfo, err error) {
 	i, err := f.Stat()
 	if err != nil {
@@ -61,13 +77,17 @@ func (f *Dir) Readdir(_ int) (fi []os.FileInfo, err error) {
 	}
 	name := f.f.Name()
 	dce, err := f.dc.Get(name)
+	log := f.log
 	if err == NoCacheEntry || i.ModTime().After(dce.mtime) {
-		fi, err = f.f.Readdir(0)
+		log.V(3).Info("cache miss")
+		fi, err = readDir(f.f)
 		if err != nil {
 			return
 		}
 		dce = &DirCacheEntry{i.ModTime(), fi}
 		f.dc.Set(name, dce)
+	} else {
+		log.V(3).Info("cache hit")
 	}
 	fi = dce.fi
 	return

pkg/fs/fs.go

@@ -205,7 +205,7 @@ func (fs *FS) Open(name string) (f http.File, err error) {
 			offline = true
 			log.V(2).Info("dir offline mode", "path", dp)
 		}
-		f = &Dir{f: sf, dc: fs.dc}
+		f = &Dir{log: log.WithName("dir"), f: sf, dc: fs.dc}
 		return
 	}
 	md := fs.metadata(name, sfi.Size())
@@ -295,10 +295,32 @@ func (fs *FS) flusher(ctx context.Context) {
 			return
 		case <-time.After(time.Minute * 5):
 		}
+		fs.cleanupEmptyDirs()
 		fs.flushMetadata()
 	}
 }
 
+func (fs *FS) cleanupEmptyDirs() {
+	filepath.WalkDir(fs.dst, func(path string, d stdfs.DirEntry, err error) error {
+		if err == nil && d.IsDir() {
+			if path == fs.dst {
+				return nil
+			}
+			empty, err := dirEmpty(path)
+			if err != nil || !empty {
+				return nil
+			}
+			log := fs.log.WithValues("dir", path)
+			log.V(2).Info("removing empty dir")
+			err = os.Remove(path)
+			if err != nil {
+				log.Error(err, "failed to remove empty dir")
+			}
+		}
+		return nil
+	})
+}
+
 func (fs *FS) flushMetadata() {
 	log := fs.log
 	fs.mu.Lock()
@@ -341,10 +363,11 @@ func dirEmpty(name string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	defer f.Close()
+	_, err = f.ReadDir(1)
-	_, err = f.Readdir(1)
 	if err == io.EOF {
+		f.Close()
 		return true, nil
 	}
+	f.Close()
 	return false, err
 }

pkg/srv/interceptor.go

@@ -5,8 +5,8 @@ package srv
 import (
 	"bytes"
 	"encoding/xml"
+	"html/template"
 	"net/http"
-	"sort"
 	"strings"
 
 	"cachefs/pkg/fs"
@@ -41,12 +41,22 @@ func (s *statusInterceptor) Status() int {
 
 type dirContents struct {
 	AllPaths []string `xml:"a"`
-	Dirs     []string `xml:"-"`
+	Dirs     dirs     `xml:"-"`
 	Files    files    `xml:"-"`
 }
 
+type dir struct {
+	Name template.HTML
+	URI  template.HTML
+}
+
+type dirs []dir
+
+func (dirs) Less(i, j dir) bool { return i.Name < j.Name }
+
 type file struct {
-	Name   string
+	Name   template.HTML
+	URI    template.HTML
 	Anchor string
 	Status int
 }
@@ -80,25 +90,36 @@ func (r *responseInterceptor) Status() int {
 	return r.status
 }
 
-func (r *responseInterceptor) GetPaths(path string, fs *fs.FS) (dir dirContents, err error) {
+func (r *responseInterceptor) GetPaths(path string, fs *fs.FS) (dc dirContents, err error) {
-	err = xml.Unmarshal(r.buf.Bytes(), &dir)
+	buf := r.buf.Bytes()
+	buf = bytes.ReplaceAll(buf, []byte{'&'}, []byte("&#38;"))
+	err = xml.Unmarshal(buf, &dc)
 	if err != nil {
 		return
 	}
 	path = strings.TrimSuffix(path, "/")
-	for _, p := range dir.AllPaths {
+	for _, p := range dc.AllPaths {
+		p = strings.ReplaceAll(p, "&amp;", "&")
+		p = strings.ReplaceAll(p, "&#39;", "'")
+		name := template.HTML(p)
+		full := path + "/" + p
+		uri := template.HTML(full)
 		if p[len(p)-1] == '/' {
-			dir.Dirs = append(dir.Dirs, p)
+			dc.Dirs = append(dc.Dirs, dir{
+				Name: name,
+				URI:  uri,
+			})
 		} else {
-			dir.Files = append(dir.Files, file{
+			dc.Files = append(dc.Files, file{
-				Name:   p,
+				Name:   name,
+				URI:    uri,
 				Anchor: anchor(p),
-				Status: fs.CacheStatus(path + "/" + p),
+				Status: fs.CacheStatus(full),
 			})
 		}
 	}
-	sort.Strings(dir.Dirs)
+	slices.SortFunc(dc.Dirs, dc.Dirs.Less)
-	slices.SortFunc(dir.Files, dir.Files.Less)
+	slices.SortFunc(dc.Files, dc.Files.Less)
 	return
 }
 

pkg/srv/templates.go

@@ -24,13 +24,13 @@ var (
   </pre>
   <table>
     <tr><th style="width:100%;">Path</th><th>Options</th></tr>
-    <tr><td><a href="../">../</a></td><td></td></tr>
+    <tr><td><a href="../">../</a></td><td>[dir]</td></tr>
 {{range $s := .Dirs -}}
-    <tr><td><a href="{{$s}}">{{$s}}</a></td><td></td></tr>
+    <tr><td><a href="{{$s.URI}}">{{$s.Name}}</a></td><td>[dir]</td></tr>
 {{end -}}
 {{range $s := .Files -}}
-    <tr><td><a id="{{$s.Anchor}}" href="{{$s.Name}}">{{$s.Name}}</a></td>
+    <tr><td><a id="{{$s.Anchor}}" href="{{$s.URI}}">{{$s.Name}}</a></td>
-    <td><a href="{{$s.Name}}?o=v">[v]</a>&nbsp;<a href="{{$s.Name}}?o=n">[n]</a>&nbsp;<a href="{{$s.Name}}?o=p">[p]</a>&nbsp;<a href="{{$s.Name}}?o=s">[s]</a>&nbsp;{{if ne $s.Status -1}}{{$s.Status}}%{{end}}</td></tr>
+    <td><a href="{{$s.URI}}?o=v">[v]</a>&nbsp;<a href="{{$s.URI}}?o=n">[n]</a>&nbsp;<a href="{{$s.URI}}?o=p">[p]</a>&nbsp;<a href="{{$s.URI}}?o=s">[s]</a>&nbsp;{{if ne $s.Status -1}}{{$s.Status}}%{{end}}</td></tr>
 {{end -}}
   </table>
   </article>