lkn
/
ollie-9p
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix empty session directories: add WithListDir hook 

DirStore.ListDir now uses listDirFn when set.
SessionManager wires ListDir through the hook so
session subdirectory listing works via the DirStore view.
This commit is contained in:
Levi Neely 2026-05-19 17:43:48 +02:00
parent 18aaddd8b1
commit 46c025b594
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
store/dirstore.go
View File

@ -23,6 +23,7 @@ type DirStore struct {
renameFn func([]string, string, string) error renameFn func([]string, string, string) error
openFn func([]string, string) (StoreEntry, error) openFn func([]string, string) (StoreEntry, error)
statFn func([]string, string) (os.FileInfo, error) statFn func([]string, string) (os.FileInfo, error)
listDirFn func([]string, string) ([]os.DirEntry, error)
children map[string]*DirStore children map[string]*DirStore
} }
@ -73,6 +74,11 @@ func WithStat(fn func(dirs []string, name string) (os.FileInfo, error)) DirOptio
return func(d *DirStore) { d.statFn = fn } return func(d *DirStore) { d.statFn = fn }
} }
// WithListDir overrides subdirectory listing.
func WithListDir(fn func(dirs []string, name string) ([]os.DirEntry, error)) DirOption {
return func(d *DirStore) { d.listDirFn = fn }
}
// NewDirStore creates a DirStore backed by one or more directories. // NewDirStore creates a DirStore backed by one or more directories.
// The first directory is the write target for unions. // The first directory is the write target for unions.
func NewDirStore(dirs []string, perm os.FileMode, opts ...DirOption) *DirStore { func NewDirStore(dirs []string, perm os.FileMode, opts ...DirOption) *DirStore {
@ -338,6 +344,9 @@ func (d *DirStore) ListDir(rel string) ([]os.DirEntry, error) {
} }
return child.ListDir(rest) return child.ListDir(rest)
} }
if d.listDirFn != nil {
return d.listDirFn(d.dirs, rel)
}
if len(d.dirs) == 0 { if len(d.dirs) == 0 {
return nil, fmt.Errorf("%s: not found", rel) return nil, fmt.Errorf("%s: not found", rel)
} }

1
store/session.go
View File

@ -155,6 +155,7 @@ func NewSessionManager(cfg SessionManagerConfig) *SessionManager {
WithStat(func(_ []string, name string) (os.FileInfo, error) { return ss.stat(name) }), WithStat(func(_ []string, name string) (os.FileInfo, error) { return ss.stat(name) }),
WithOpener(func(_ []string, name string) (StoreEntry, error) { return ss.openEntry(name) }), WithOpener(func(_ []string, name string) (StoreEntry, error) { return ss.openEntry(name) }),
WithLister(func(_ []string) ([]os.DirEntry, error) { return ss.list() }), WithLister(func(_ []string) ([]os.DirEntry, error) { return ss.list() }),
WithListDir(func(_ []string, name string) ([]os.DirEntry, error) { return ss.ListDir(name) }),
WithDeleter(func(_ []string, name string) error { return ss.del(name) }), WithDeleter(func(_ []string, name string) error { return ss.del(name) }),
WithCreator(func(_ []string, name string, _ os.FileMode) error { return ss.create(name) }), WithCreator(func(_ []string, name string, _ os.FileMode) error { return ss.create(name) }),
WithRenamer(func(_ []string, old, new string) error { return ss.renameSession(old, new) }), WithRenamer(func(_ []string, old, new string) error { return ss.renameSession(old, new) }),