Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/adapters/ui/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,15 @@ func (t *tui) handleSortToggle() {
t.sortMode = t.sortMode.ToggleField()
t.showStatusTemp("Sort: " + t.sortMode.String())
t.updateListTitle()
t.persistSortMode()
t.refreshServerList()
}

func (t *tui) handleSortReverse() {
t.sortMode = t.sortMode.Reverse()
t.showStatusTemp("Sort: " + t.sortMode.String())
t.updateListTitle()
t.persistSortMode()
t.refreshServerList()
}

Expand Down
116 changes: 116 additions & 0 deletions internal/adapters/ui/settings.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
// Copyright 2025.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package ui

import (
"encoding/json"
"errors"
"os"
"path/filepath"

"go.uber.org/zap"
)

type settingsManager struct {
filePath string
logger *zap.SugaredLogger
}

type uiSettings struct {
SortMode SortMode `json:"sort_mode,omitempty"`
}

func newSettingsManager(logger *zap.SugaredLogger) *settingsManager {
home, err := os.UserHomeDir()
if err != nil {
logger.Warnw("failed to determine home directory for settings", "error", err)
return nil
}

return &settingsManager{
filePath: filepath.Join(home, ".lazyssh", "settings.json"),
logger: logger,
}
}

func (m *settingsManager) LoadSortMode() (SortMode, error) {
if m == nil {
return SortByAliasAsc, errors.New("nil settings manager")
}

settings, err := m.load()
if err != nil {
return SortByAliasAsc, err
}

if !settings.SortMode.valid() {
return SortByAliasAsc, nil
}

return settings.SortMode, nil
}

func (m *settingsManager) SaveSortMode(mode SortMode) error {
if m == nil {
return errors.New("nil settings manager")
}

settings, err := m.load()
if err != nil {
return err
}

settings.SortMode = mode
return m.save(settings)
}

func (m *settingsManager) load() (uiSettings, error) {
var settings uiSettings

data, err := os.ReadFile(m.filePath)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
return settings, nil
}
return settings, err
}

if len(data) == 0 {
return settings, nil
}

if err := json.Unmarshal(data, &settings); err != nil {
// Handle unmarshal errors (e.g., old string format vs new int format)
// by returning default settings. This allows automatic migration from
// old format to new format when SaveSortMode is called.
m.logger.Warnw("failed to parse settings file, using defaults", "error", err, "path", m.filePath)
return uiSettings{}, nil
}

return settings, nil
}

func (m *settingsManager) save(settings uiSettings) error {
if err := os.MkdirAll(filepath.Dir(m.filePath), 0o750); err != nil {
return err
}

data, err := json.MarshalIndent(settings, "", " ")
if err != nil {
return err
}

return os.WriteFile(m.filePath, data, 0o600)
}
12 changes: 12 additions & 0 deletions internal/adapters/ui/sort.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ func (m SortMode) Reverse() SortMode {
}
}

func (m SortMode) valid() bool {
switch m {
case SortByAliasAsc,
SortByAliasDesc,
SortByLastSeenAsc,
SortByLastSeenDesc:
return true
default:
return false
}
}

// sortServersForUI sorts servers according to the rules required by the UI.
// Pinned servers are always at the top, ordered by pinned date (newest first).
// Unpinned servers are sorted by the selected mode. "Never" (zero time) goes to
Expand Down
28 changes: 27 additions & 1 deletion internal/adapters/ui/tui.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type tui struct {

app *tview.Application
serverService ports.ServerService
settings *settingsManager

header *AppHeader
searchBar *SearchBar
Expand All @@ -55,6 +56,7 @@ func NewTUI(logger *zap.SugaredLogger, ss ports.ServerService, version, commit s
serverService: ss,
version: version,
commit: commit,
settings: newSettingsManager(logger),
}
}

Expand All @@ -65,7 +67,7 @@ func (t *tui) Run() error {
}
}()
t.app.EnableMouse(true)
t.initializeTheme().buildComponents().buildLayout().bindEvents().loadInitialData()
t.initializeTheme().buildComponents().loadPreferences().buildLayout().bindEvents().loadInitialData()
t.app.SetRoot(t.root, true)
t.logger.Infow("starting TUI application", "version", t.version, "commit", t.commit)
if err := t.app.Run(); err != nil {
Expand Down Expand Up @@ -107,6 +109,20 @@ func (t *tui) buildComponents() *tui {
return t
}

func (t *tui) loadPreferences() *tui {
if t.settings == nil {
return t
}

if mode, err := t.settings.LoadSortMode(); err == nil {
t.sortMode = mode
} else {
t.logger.Warnw("failed to load sort mode preference", "error", err)
}

return t
}

func (t *tui) buildLayout() *tui {
t.left = tview.NewFlex().SetDirection(tview.FlexRow).
AddItem(t.searchBar, 3, 0, false).
Expand Down Expand Up @@ -145,3 +161,13 @@ func (t *tui) updateListTitle() {
t.serverList.SetTitle(" Servers — Sort: " + t.sortMode.String() + " ")
}
}

func (t *tui) persistSortMode() {
if t.settings == nil {
return
}

if err := t.settings.SaveSortMode(t.sortMode); err != nil {
t.logger.Warnw("failed to save sort mode preference", "error", err)
}
}