added directory cleanup

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
 }