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

session: rename Store → Tree (openStore→openSessionTree, openAgentStore→openAgentTree) 

'Store' was a legacy name. These are file trees.
This commit is contained in:
Levi Neely 2026-07-29 20:58:03 +02:00
parent 1ce845e83f
commit 4359f354af
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
session/manager.go
View File

@ -16,7 +16,7 @@ import (
"sync/atomic" "sync/atomic"
) )
var sessionStoreOrder = []string{"new", "idx", "ls", "kill", "sh", "b", "bfg", "bbg", "cleanup"} var sessionFileOrder = []string{"new", "idx", "ls", "kill", "sh", "b", "bfg", "bbg", "cleanup"}
// FileMode returns the mode for a fixed session file, // FileMode returns the mode for a fixed session file,
// or 0 and false if the name is not a fixed file. // or 0 and false if the name is not a fixed file.
@ -119,8 +119,8 @@ func (s *Manager) List() ([]os.DirEntry, error) {
} }
func (s *Manager) list() ([]os.DirEntry, error) { func (s *Manager) list() ([]os.DirEntry, error) {
entries := make([]os.DirEntry, 0, len(sessionStoreOrder)) entries := make([]os.DirEntry, 0, len(sessionFileOrder))
for _, name := range sessionStoreOrder { for _, name := range sessionFileOrder {
entries = append(entries, fs.FileEntry(name, fs.Perms[fs.PathSessions].Files[name])) entries = append(entries, fs.FileEntry(name, fs.Perms[fs.PathSessions].Files[name]))
} }
s.mu.RLock() s.mu.RLock()
@ -161,7 +161,7 @@ func (s *Manager) Readdir(name string) ([]os.DirEntry, error) {
} }
// {id}/agent/{aid} — list agent files + proc/ // {id}/agent/{aid} — list agent files + proc/
if len(parts) == 3 { if len(parts) == 3 {
afs, err := s.openAgentStore(sess) afs, err := s.openAgentTree(sess)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -319,7 +319,7 @@ func (s *Manager) stat(name string) (os.FileInfo, error) {
if parts[3] == "proc" { if parts[3] == "proc" {
return &fs.SyntheticFileInfo{Name_: "proc", Mode_: 0755, IsDir_: true}, nil return &fs.SyntheticFileInfo{Name_: "proc", Mode_: 0755, IsDir_: true}, nil
} }
afs, err := s.openAgentStore(sess) afs, err := s.openAgentTree(sess)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -341,7 +341,7 @@ func (s *Manager) stat(name string) (os.FileInfo, error) {
return &fs.SyntheticFileInfo{Name_: peerID, Mode_: 0666}, nil return &fs.SyntheticFileInfo{Name_: peerID, Mode_: 0666}, nil
} }
// Session file: {id}/{file} (plan, env) // Session file: {id}/{file} (plan, env)
sfs, err := s.openStore(sess) sfs, err := s.openSessionTree(sess)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -461,7 +461,7 @@ func (s *Manager) openEntry(name string) (fs.File, error) {
return nil, fmt.Errorf("%s: is a directory", name) return nil, fmt.Errorf("%s: is a directory", name)
} }
// parts[2] = aid, parts[3] = file // parts[2] = aid, parts[3] = file
afs, err := s.openAgentStore(sess) afs, err := s.openAgentTree(sess)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -469,7 +469,7 @@ func (s *Manager) openEntry(name string) (fs.File, error) {
} }
// Session file: {id}/{file} // Session file: {id}/{file}
sfs, err := s.openStore(sess) sfs, err := s.openSessionTree(sess)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -541,15 +541,15 @@ func (s *Manager) SessionByUname(uname string) *Session {
return nil return nil
} }
// OpenStore returns a Tree for the given session ID. // OpenSessionTree returns a Tree for the given session ID.
func (s *Manager) OpenStore(id string) (*fs.Tree, error) { func (s *Manager) OpenSessionTree(id string) (*fs.Tree, error) {
if sess := s.Session(id); sess != nil { if sess := s.Session(id); sess != nil {
return s.openStore(sess) return s.openSessionTree(sess)
} }
return nil, fmt.Errorf("session not found: %s", id) return nil, fmt.Errorf("session not found: %s", id)
} }
func (s *Manager) openStore(sess *Session) (*fs.Tree, error) { func (s *Manager) openSessionTree(sess *Session) (*fs.Tree, error) {
var resetElev func() var resetElev func()
if s.cfg.ResetElevation != nil { if s.cfg.ResetElevation != nil {
id := sess.id id := sess.id
@ -567,7 +567,7 @@ func (s *Manager) openStore(sess *Session) (*fs.Tree, error) {
), nil ), nil
} }
func (s *Manager) openAgentStore(sess *Session) (*fs.Tree, error) { func (s *Manager) openAgentTree(sess *Session) (*fs.Tree, error) {
var resetElev func() var resetElev func()
if s.cfg.ResetElevation != nil { if s.cfg.ResetElevation != nil {
id := sess.id id := sess.id