attr

Author: lobis

eos/client_test.go

@@ -602,6 +602,29 @@ func TestNamespaceStatsParseWithPreamble(t *testing.T) {
 	}
 }
 
+func TestParseNamespaceAttrs(t *testing.T) {
+	input := `
+* attr listing
+sys.forced.layout="replica"
+user.comment = "hello world"
+sys.mask=755
+`
+
+	attrs := parseNamespaceAttrs([]byte(input))
+	if len(attrs) != 3 {
+		t.Fatalf("expected 3 attrs, got %d", len(attrs))
+	}
+	if attrs[0].Key != "sys.forced.layout" || attrs[0].Value != "replica" {
+		t.Fatalf("unexpected first attr: %+v", attrs[0])
+	}
+	if attrs[1].Key != "sys.mask" || attrs[1].Value != "755" {
+		t.Fatalf("unexpected second attr: %+v", attrs[1])
+	}
+	if attrs[2].Key != "user.comment" || attrs[2].Value != "hello world" {
+		t.Fatalf("unexpected third attr: %+v", attrs[2])
+	}
+}
+
 func TestParseEOSServerVersion(t *testing.T) {
 	tests := []struct {
 		name  string

eos/fetch_namespace.go

@@ -97,6 +97,17 @@ func (c *Client) StatPath(ctx context.Context, rawPath string) (Entry, error) {
 	return c.statPathViaCLI(rawPath)
 }
 
+func (c *Client) ListAttrs(ctx context.Context, rawPath string) ([]NamespaceAttr, error) {
+	_ = ctx
+
+	output, err := c.runCommand("eos", "attr", "ls", rawPath)
+	if err != nil {
+		return nil, fmt.Errorf("eos attr ls: %w", err)
+	}
+
+	return parseNamespaceAttrs(output), nil
+}
+
 func (c *Client) statPathViaCLI(rawPath string) (Entry, error) {
 	info, err := c.fetchCLIFileInfo(rawPath)
 	if err != nil {
@@ -191,3 +202,37 @@ func entryFromCLI(info cliFileInfo) Entry {
 
 	return entry
 }
+
+func parseNamespaceAttrs(output []byte) []NamespaceAttr {
+	lines := strings.Split(strings.ReplaceAll(string(output), "\r\n", "\n"), "\n")
+	attrs := make([]NamespaceAttr, 0, len(lines))
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, "*") {
+			continue
+		}
+
+		key, value, found := strings.Cut(line, "=")
+		if !found {
+			continue
+		}
+
+		key = strings.TrimSpace(key)
+		value = strings.TrimSpace(value)
+		value = strings.Trim(value, "\"")
+		if key == "" {
+			continue
+		}
+
+		attrs = append(attrs, NamespaceAttr{
+			Key:   key,
+			Value: value,
+		})
+	}
+
+	sort.Slice(attrs, func(i, j int) bool {
+		return strings.ToLower(attrs[i].Key) < strings.ToLower(attrs[j].Key)
+	})
+
+	return attrs
+}

eos/types.go

@@ -59,6 +59,11 @@ type Directory struct {
 	Entries []Entry
 }
 
+type NamespaceAttr struct {
+	Key   string
+	Value string
+}
+
 type NodeStats struct {
 	State       string
 	FileCount   uint64

ui/commands.go

@@ -94,6 +94,13 @@ func loadDirectoryCmd(client *eos.Client, dirPath string) tea.Cmd {
 	}
 }
 
+func loadNamespaceAttrsCmd(client *eos.Client, path string) tea.Cmd {
+	return func() tea.Msg {
+		attrs, err := client.ListAttrs(context.Background(), path)
+		return namespaceAttrsLoadedMsg{path: path, attrs: attrs, err: err}
+	}
+}
+
 func loadSpaceStatusCmd(client *eos.Client) tea.Cmd {
 	return func() tea.Msg {
 		records, err := client.SpaceStatus(context.Background(), "default")

ui/keys.go

@@ -147,24 +147,27 @@ func (m model) updateFileSystemKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 
 func (m model) updateNamespaceKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	half := max(1, m.height/6)
+	selectionChanged := false
 	switch msg.String() {
 	case "up", "k":
 		if m.nsSelected > 0 {
 			m.nsSelected--
+			selectionChanged = true
 		}
 	case "down", "j":
 		if m.nsSelected < len(m.directory.Entries)-1 {
 			m.nsSelected++
+			selectionChanged = true
 		}
 	case "ctrl+u":
 		m.nsSelected = max(0, m.nsSelected-half)
-		return m, nil
+		selectionChanged = true
 	case "ctrl+d":
 		m.nsSelected = min(len(m.directory.Entries)-1, m.nsSelected+half)
-		return m, nil
+		selectionChanged = true
 	case "G":
 		m.nsSelected = max(0, len(m.directory.Entries)-1)
-		return m, nil
+		selectionChanged = true
 	case "g":
 		m.nsSelected = 0
 		m.nsLoading = true
@@ -188,6 +191,10 @@ func (m model) updateNamespaceKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		}
 	}
 
+	if selectionChanged {
+		return m.startNamespaceAttrLoad(false)
+	}
+
 	return m, nil
 }
 

ui/model.go

@@ -27,8 +27,10 @@ func NewModel(client *eos.Client, endpoint, rootPath string) tea.Model {
 	)
 
 	state := persistedUIState{}
+	activeView := defaultActiveView()
 	if rootPath == "" {
 		state = loadPersistedUIState()
+		activeView = state.ActiveView
 	}
 	initialPath := rootPath
 	if initialPath == "" {
@@ -37,7 +39,6 @@ func NewModel(client *eos.Client, endpoint, rootPath string) tea.Model {
 	if initialPath == "" {
 		initialPath = "/eos"
 	}
-	activeView := state.ActiveView
 	commandLogVisible := state.CommandLogVisible
 
 	return model{
@@ -162,40 +163,13 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			return m, nil
 		case "tab":
-			m.activeView = (m.activeView + 1) % viewCount
+			m.activeView = nextOrderedView(m.activeView, 1)
 			return m.onViewChanged()
 		case "shift+tab":
-			m.activeView = (m.activeView + viewCount - 1) % viewCount
+			m.activeView = nextOrderedView(m.activeView, -1)
 			return m.onViewChanged()
-		case "1":
-			m.activeView = viewMGM
-			return m.onViewChanged()
-		case "2":
-			m.activeView = viewQDB
-			return m.onViewChanged()
-		case "3":
-			m.activeView = viewFST
-			return m.onViewChanged()
-		case "4":
-			m.activeView = viewFileSystems
-			return m.onViewChanged()
-		case "5":
-			m.activeView = viewNamespace
-			return m.onViewChanged()
-		case "6":
-			m.activeView = viewSpaces
-			return m.onViewChanged()
-		case "7":
-			m.activeView = viewNamespaceStats
-			return m.onViewChanged()
-		case "8":
-			m.activeView = viewSpaceStatus
-			return m.onViewChanged()
-		case "9":
-			m.activeView = viewIOShaping
-			return m.onViewChanged()
-		case "0":
-			m.activeView = viewGroups
+		case "1", "2", "3", "4", "5", "6", "7", "8", "9", "0":
+			m.activeView, _ = viewForHotkey(msg.String())
 			return m.onViewChanged()
 		case "r":
 			return m.refreshActiveView()
@@ -360,6 +334,17 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			m.status = fmt.Sprintf("Browsing namespace %s", m.directory.Path)
 			m.persistUIState()
+			return m.startNamespaceAttrLoad(true)
+		}
+	case namespaceAttrsLoadedMsg:
+		if msg.path != m.nsAttrsTargetPath {
+			return m, nil
+		}
+		m.nsAttrsLoading = false
+		m.nsAttrsLoaded = true
+		m.nsAttrsErr = msg.err
+		if msg.err == nil {
+			m.nsAttrs = msg.attrs
 		}
 	case spaceStatusLoadedMsg:
 		m.spaceStatusLoading = false
@@ -636,16 +621,49 @@ func (m model) refreshActiveView() (tea.Model, tea.Cmd) {
 }
 
 func (m model) maybeLoadNamespace() (tea.Model, tea.Cmd) {
-	if m.nsLoaded || m.nsLoading {
+	if m.nsLoading {
 		return m, nil
 	}
+	if m.nsLoaded {
+		return m.startNamespaceAttrLoad(false)
+	}
 
 	m.nsLoading = true
 	m.nsErr = nil
 	m.status = fmt.Sprintf("Loading namespace %s...", m.directory.Path)
 	return m, loadDirectoryCmd(m.client, m.directory.Path)
 }
 
+func (m model) currentNamespaceAttrTargetPath() string {
+	if selected, ok := m.selectedNamespaceEntry(); ok && selected.Path != "" {
+		return selected.Path
+	}
+	if m.directory.Self.Path != "" {
+		return m.directory.Self.Path
+	}
+	if m.directory.Path != "" {
+		return m.directory.Path
+	}
+	return "/"
+}
+
+func (m model) startNamespaceAttrLoad(force bool) (tea.Model, tea.Cmd) {
+	path := m.currentNamespaceAttrTargetPath()
+	if path == "" || m.client == nil {
+		return m, nil
+	}
+	if !force && m.nsAttrsTargetPath == path && (m.nsAttrsLoading || m.nsAttrsLoaded) {
+		return m, nil
+	}
+
+	m.nsAttrsTargetPath = path
+	m.nsAttrsLoading = true
+	m.nsAttrsLoaded = false
+	m.nsAttrsErr = nil
+	m.nsAttrs = nil
+	return m, loadNamespaceAttrsCmd(m.client, path)
+}
+
 func (m model) maybeLoadSpaceStatus() (tea.Model, tea.Cmd) {
 	if !m.spaceStatusLoading && len(m.spaceStatus) > 0 {
 		return m, nil