mirror of
https://github.com/lukaszraczylo/lolcathost.git
synced 2026-11-18 09:25:37 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76e364ca3e | ||
|
|
9598444d56 | ||
|
|
1b832e2fcf |
+1
-1
@@ -52,7 +52,7 @@ release:
|
||||
brews:
|
||||
- repository:
|
||||
owner: lukaszraczylo
|
||||
name: brew-taps
|
||||
name: homebrew-taps
|
||||
token: "{{ .Env.HOMEBREW_TAP_TOKEN }}"
|
||||
directory: Formula
|
||||
homepage: https://github.com/lukaszraczylo/lolcathost
|
||||
|
||||
@@ -53,7 +53,7 @@ lolcathost manages your `/etc/hosts` file with an interactive terminal interface
|
||||
### Homebrew (macOS/Linux)
|
||||
|
||||
```bash
|
||||
brew install lukaszraczylo/brew-taps/lolcathost
|
||||
brew install lukaszraczylo/taps/lolcathost
|
||||
```
|
||||
|
||||
After Homebrew installation, run:
|
||||
|
||||
+1
-1
@@ -278,7 +278,7 @@
|
||||
<i class="fas fa-beer mr-2 text-amber-500"></i>
|
||||
Homebrew (macOS/Linux)
|
||||
</h3>
|
||||
<pre class="bg-gray-900 text-gray-100 p-4 rounded-lg overflow-x-auto"><code>brew install lukaszraczylo/brew-taps/lolcathost
|
||||
<pre class="bg-gray-900 text-gray-100 p-4 rounded-lg overflow-x-auto"><code>brew install lukaszraczylo/taps/lolcathost
|
||||
sudo lolcathost --install</code></pre>
|
||||
</div>
|
||||
<div class="glass p-6 rounded-xl">
|
||||
|
||||
@@ -219,6 +219,21 @@ func TestServer_HandleDelete(t *testing.T) {
|
||||
assert.Equal(t, "ok", resp.Status)
|
||||
})
|
||||
|
||||
t.Run("verify deleted entry not in list", func(t *testing.T) {
|
||||
// After delete, list should not contain the deleted entry
|
||||
resp := server.handleList()
|
||||
assert.Equal(t, "ok", resp.Status)
|
||||
|
||||
var data protocol.ListData
|
||||
err := resp.ParseData(&data)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Check that the deleted entry is not in the list
|
||||
for _, entry := range data.Entries {
|
||||
assert.NotEqual(t, "todelete", entry.Alias, "deleted entry should not appear in list")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("delete nonexistent", func(t *testing.T) {
|
||||
req, _ := protocol.NewRequest(protocol.RequestDelete, protocol.DeletePayload{
|
||||
Alias: "nonexistent",
|
||||
|
||||
+139
-25
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/charmbracelet/bubbles/textinput"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
|
||||
"github.com/lukaszraczylo/lolcathost/internal/client"
|
||||
"github.com/lukaszraczylo/lolcathost/internal/config"
|
||||
@@ -27,6 +28,7 @@ const (
|
||||
ViewBackups
|
||||
ViewHelp
|
||||
ViewSearch
|
||||
ViewConfirmDelete
|
||||
)
|
||||
|
||||
// Model is the main Bubble Tea model.
|
||||
@@ -45,13 +47,14 @@ type Model struct {
|
||||
searchInput textinput.Model
|
||||
|
||||
// State
|
||||
width int
|
||||
height int
|
||||
message string
|
||||
messageStyle string // "error" or "success"
|
||||
messageTime time.Time
|
||||
searchTerm string
|
||||
allGroups []string // All groups including empty ones
|
||||
width int
|
||||
height int
|
||||
message string
|
||||
messageStyle string // "error" or "success"
|
||||
messageTime time.Time
|
||||
searchTerm string
|
||||
allGroups []string // All groups including empty ones
|
||||
pendingDeleteAlias string // Alias of host pending delete confirmation
|
||||
|
||||
// Update notification
|
||||
updateAvailable bool
|
||||
@@ -352,7 +355,8 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
// Mark as disconnected to trigger reconnect
|
||||
m.connected = false
|
||||
m.client.Close()
|
||||
} else if msg.entries != nil {
|
||||
} else {
|
||||
// Always update the list, even if entries is nil/empty
|
||||
m.list.SetItems(msg.entries)
|
||||
}
|
||||
|
||||
@@ -385,7 +389,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
m.mode = ViewList
|
||||
|
||||
case deleteMsg:
|
||||
// Clear pending state regardless of success/failure
|
||||
m.list.SetPending(msg.alias, false)
|
||||
if msg.err != nil {
|
||||
m.list.SetError(msg.alias, true)
|
||||
m.setError(fmt.Sprintf("Delete failed: %v", msg.err))
|
||||
} else {
|
||||
cmds = append(cmds, m.refresh())
|
||||
@@ -521,6 +528,8 @@ func (m *Model) handleKey(msg tea.KeyMsg) tea.Cmd {
|
||||
return m.handleHelpKey(msg)
|
||||
case ViewSearch:
|
||||
return m.handleSearchKey(msg)
|
||||
case ViewConfirmDelete:
|
||||
return m.handleConfirmDeleteKey(msg)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -554,7 +563,8 @@ func (m *Model) handleListKey(msg tea.KeyMsg) tea.Cmd {
|
||||
}
|
||||
case "d":
|
||||
if item := m.list.Selected(); item != nil {
|
||||
return m.deleteHost(item.Entry.Alias)
|
||||
m.pendingDeleteAlias = item.Entry.Alias
|
||||
m.mode = ViewConfirmDelete
|
||||
}
|
||||
case "p":
|
||||
m.mode = ViewPresets
|
||||
@@ -850,6 +860,23 @@ func (m *Model) handleSearchKey(msg tea.KeyMsg) tea.Cmd {
|
||||
return cmd
|
||||
}
|
||||
|
||||
func (m *Model) handleConfirmDeleteKey(msg tea.KeyMsg) tea.Cmd {
|
||||
switch msg.String() {
|
||||
case "y", "Y":
|
||||
alias := m.pendingDeleteAlias
|
||||
m.pendingDeleteAlias = ""
|
||||
m.mode = ViewList
|
||||
// Set pending state for visual feedback
|
||||
m.list.SetPending(alias, true)
|
||||
return m.deleteHost(alias)
|
||||
case "n", "N", "esc":
|
||||
m.pendingDeleteAlias = ""
|
||||
m.mode = ViewList
|
||||
return nil
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Model) toggleSelected() tea.Cmd {
|
||||
item := m.list.Selected()
|
||||
if item == nil {
|
||||
@@ -904,6 +931,8 @@ func (m *Model) View() string {
|
||||
sb.WriteString(m.helpView())
|
||||
case ViewSearch:
|
||||
sb.WriteString(m.searchView())
|
||||
case ViewConfirmDelete:
|
||||
sb.WriteString(m.confirmDeleteView())
|
||||
}
|
||||
|
||||
// Message
|
||||
@@ -920,8 +949,15 @@ func (m *Model) View() string {
|
||||
currentContent := sb.String()
|
||||
currentLines := strings.Count(currentContent, "\n") + 1
|
||||
|
||||
// Fill space to push footer to bottom (reserve 3 lines for footer)
|
||||
footerHeight := 3
|
||||
// Calculate footer height dynamically (help bar lines + status bar + spacing)
|
||||
footerHeight := 2 // status bar + newline before it
|
||||
var helpBarContent string
|
||||
if m.mode == ViewList {
|
||||
helpBarContent = m.helpBar()
|
||||
helpBarLines := strings.Count(helpBarContent, "\n") + 1
|
||||
footerHeight += helpBarLines + 1 // +1 for newline before help bar
|
||||
}
|
||||
|
||||
remainingLines := m.height - currentLines - footerHeight
|
||||
if remainingLines > 0 {
|
||||
sb.WriteString(strings.Repeat("\n", remainingLines))
|
||||
@@ -930,7 +966,7 @@ func (m *Model) View() string {
|
||||
// Footer (help bar + status bar)
|
||||
if m.mode == ViewList {
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(m.helpBar())
|
||||
sb.WriteString(helpBarContent)
|
||||
}
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(m.statusBar())
|
||||
@@ -939,19 +975,67 @@ func (m *Model) View() string {
|
||||
}
|
||||
|
||||
func (m *Model) helpBar() string {
|
||||
return helpBarStyle.Render(fmt.Sprintf("%s/%s: Navigate %s: Toggle %s: New %s: Edit %s: Delete %s: Presets %s: Groups %s: Backups %s: Search %s: Help %s: Quit",
|
||||
helpKeyStyle.Render("↑↓"),
|
||||
helpKeyStyle.Render("jk"),
|
||||
helpKeyStyle.Render("Space"),
|
||||
helpKeyStyle.Render("n"),
|
||||
helpKeyStyle.Render("e"),
|
||||
helpKeyStyle.Render("d"),
|
||||
helpKeyStyle.Render("p"),
|
||||
helpKeyStyle.Render("g"),
|
||||
helpKeyStyle.Render("b"),
|
||||
helpKeyStyle.Render("/"),
|
||||
helpKeyStyle.Render("?"),
|
||||
helpKeyStyle.Render("q")))
|
||||
// Define help items with their display widths (without ANSI codes)
|
||||
type helpItem struct {
|
||||
key string
|
||||
desc string
|
||||
rawWidth int // width without ANSI escape codes
|
||||
}
|
||||
|
||||
items := []helpItem{
|
||||
{"↑↓/jk", "Navigate", 13},
|
||||
{"Space", "Toggle", 13},
|
||||
{"n", "New", 6},
|
||||
{"e", "Edit", 7},
|
||||
{"d", "Delete", 9},
|
||||
{"p", "Presets", 10},
|
||||
{"g", "Groups", 9},
|
||||
{"b", "Backups", 10},
|
||||
{"/", "Search", 9},
|
||||
{"?", "Help", 7},
|
||||
{"q", "Quit", 7},
|
||||
}
|
||||
|
||||
separator := " "
|
||||
sepWidth := 2
|
||||
|
||||
var lines []string
|
||||
var currentLine string
|
||||
var currentWidth int
|
||||
|
||||
for i, item := range items {
|
||||
rendered := helpKeyStyle.Render(item.key) + ": " + item.desc
|
||||
|
||||
// Check if adding this item would exceed width
|
||||
newWidth := currentWidth + item.rawWidth
|
||||
if currentWidth > 0 {
|
||||
newWidth += sepWidth
|
||||
}
|
||||
|
||||
if m.width > 0 && newWidth > m.width && currentWidth > 0 {
|
||||
// Start a new line
|
||||
lines = append(lines, currentLine)
|
||||
currentLine = rendered
|
||||
currentWidth = item.rawWidth
|
||||
} else {
|
||||
// Add to current line
|
||||
if currentWidth > 0 {
|
||||
currentLine += separator
|
||||
}
|
||||
currentLine += rendered
|
||||
currentWidth = newWidth
|
||||
if i == 0 {
|
||||
currentWidth = item.rawWidth
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add the last line
|
||||
if currentLine != "" {
|
||||
lines = append(lines, currentLine)
|
||||
}
|
||||
|
||||
return helpBarStyle.Render(strings.Join(lines, "\n"))
|
||||
}
|
||||
|
||||
func (m *Model) statusBar() string {
|
||||
@@ -1022,6 +1106,36 @@ func (m *Model) searchView() string {
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
|
||||
func (m *Model) confirmDeleteView() string {
|
||||
var sb strings.Builder
|
||||
|
||||
sb.WriteString(titleStyle.Render("Confirm Delete"))
|
||||
sb.WriteString("\n\n")
|
||||
|
||||
// Find the entry details for the pending delete
|
||||
var domain, ip string
|
||||
for _, item := range m.list.items {
|
||||
if item.Entry.Alias == m.pendingDeleteAlias {
|
||||
domain = item.Entry.Domain
|
||||
ip = item.Entry.IP
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
warningStyle := lipgloss.NewStyle().Foreground(colorWarning).Bold(true)
|
||||
sb.WriteString(warningStyle.Render("Are you sure you want to delete this host?"))
|
||||
sb.WriteString("\n\n")
|
||||
|
||||
sb.WriteString(fmt.Sprintf(" Alias: %s\n", helpKeyStyle.Render(m.pendingDeleteAlias)))
|
||||
sb.WriteString(fmt.Sprintf(" Domain: %s\n", helpDescStyle.Render(domain)))
|
||||
sb.WriteString(fmt.Sprintf(" IP: %s\n", helpDescStyle.Render(ip)))
|
||||
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(helpDescStyle.Render("y confirm • n/Esc cancel"))
|
||||
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
|
||||
// Run starts the TUI application.
|
||||
func Run(socketPath string) error {
|
||||
return RunWithVersion(socketPath, "dev", "", "")
|
||||
|
||||
@@ -174,7 +174,7 @@ func (b *BackupPicker) selectView() string {
|
||||
}
|
||||
|
||||
leftSb.WriteString("\n")
|
||||
leftSb.WriteString(helpDescStyle.Render("↑↓ navigate • Enter restore • Esc cancel"))
|
||||
leftSb.WriteString(WrapHelpText("↑↓ navigate • Enter restore • Esc cancel", 40))
|
||||
|
||||
// Build right panel (preview)
|
||||
var rightSb strings.Builder
|
||||
@@ -219,7 +219,8 @@ func (b *BackupPicker) selectView() string {
|
||||
// Show scroll indicator
|
||||
if len(lines) > previewHeight {
|
||||
rightSb.WriteString("\n")
|
||||
rightSb.WriteString(helpDescStyle.Render(fmt.Sprintf("Lines %d-%d of %d (Shift+↑↓ scroll)", b.previewScroll+1, endLine, len(lines))))
|
||||
scrollText := fmt.Sprintf("%d-%d of %d (↑↓ scroll)", b.previewScroll+1, endLine, len(lines))
|
||||
rightSb.WriteString(helpDescStyle.Render(scrollText))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -291,7 +291,7 @@ func (f *Form) View() string {
|
||||
sb.WriteString("\n\n")
|
||||
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(helpDescStyle.Render("Tab/↓ next • Shift+Tab/↑ prev • ←→ select group • Enter save • Esc cancel"))
|
||||
sb.WriteString(WrapHelpText("Tab/↓ next • Shift+Tab/↑ prev • ←→ select group • Enter save • Esc cancel", f.width-6))
|
||||
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
|
||||
@@ -190,7 +190,7 @@ func (g *GroupPicker) selectView() string {
|
||||
}
|
||||
|
||||
sb.WriteString("\n\n")
|
||||
sb.WriteString(helpDescStyle.Render("↑↓ navigate • n new • r rename • d delete • Esc back"))
|
||||
sb.WriteString(WrapHelpText("↑↓ navigate • n new • r rename • d delete • Esc back", g.width-6))
|
||||
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
|
||||
@@ -407,3 +407,72 @@ func BenchmarkListView_View(b *testing.B) {
|
||||
_ = lv.View()
|
||||
}
|
||||
}
|
||||
|
||||
func TestListView_DeleteSimulation(t *testing.T) {
|
||||
lv := NewListView()
|
||||
|
||||
// Initial entries
|
||||
entries := []protocol.HostEntry{
|
||||
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||
{Domain: "b.com", IP: "127.0.0.1", Alias: "b", Enabled: false, Group: "dev"},
|
||||
{Domain: "c.com", IP: "192.168.1.1", Alias: "c", Enabled: true, Group: "staging"},
|
||||
}
|
||||
lv.SetItems(entries)
|
||||
require.Equal(t, 3, lv.Len())
|
||||
|
||||
// Select the second item
|
||||
lv.MoveDown()
|
||||
selected := lv.Selected()
|
||||
require.NotNil(t, selected)
|
||||
require.Equal(t, "b", selected.Entry.Alias)
|
||||
|
||||
// Simulate delete: set new items without the deleted entry
|
||||
entriesAfterDelete := []protocol.HostEntry{
|
||||
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||
{Domain: "c.com", IP: "192.168.1.1", Alias: "c", Enabled: true, Group: "staging"},
|
||||
}
|
||||
lv.SetItems(entriesAfterDelete)
|
||||
|
||||
// Verify list has only 2 items now
|
||||
assert.Equal(t, 2, lv.Len())
|
||||
|
||||
// Verify "b" is no longer in the list
|
||||
for i := 0; i < lv.Len(); i++ {
|
||||
assert.NotEqual(t, "b", lv.items[i].Entry.Alias, "deleted entry should not be in list")
|
||||
}
|
||||
|
||||
// Cursor should be adjusted if needed
|
||||
assert.LessOrEqual(t, lv.cursor, lv.Len()-1)
|
||||
}
|
||||
|
||||
func TestListView_SetItemsWithNil(t *testing.T) {
|
||||
lv := NewListView()
|
||||
|
||||
// Initial entries
|
||||
entries := []protocol.HostEntry{
|
||||
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||
}
|
||||
lv.SetItems(entries)
|
||||
require.Equal(t, 1, lv.Len())
|
||||
|
||||
// Set nil entries (simulating empty list from server)
|
||||
lv.SetItems(nil)
|
||||
assert.Equal(t, 0, lv.Len())
|
||||
assert.Equal(t, 0, lv.cursor)
|
||||
}
|
||||
|
||||
func TestListView_SetItemsWithEmptySlice(t *testing.T) {
|
||||
lv := NewListView()
|
||||
|
||||
// Initial entries
|
||||
entries := []protocol.HostEntry{
|
||||
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||
}
|
||||
lv.SetItems(entries)
|
||||
require.Equal(t, 1, lv.Len())
|
||||
|
||||
// Set empty slice
|
||||
lv.SetItems([]protocol.HostEntry{})
|
||||
assert.Equal(t, 0, lv.Len())
|
||||
assert.Equal(t, 0, lv.cursor)
|
||||
}
|
||||
|
||||
@@ -411,7 +411,7 @@ func (p *PresetPicker) selectView() string {
|
||||
}
|
||||
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(helpDescStyle.Render("↑↓ navigate • Enter apply • n new • e edit • d delete • Esc cancel"))
|
||||
sb.WriteString(WrapHelpText("↑↓ navigate • Enter apply • n new • e edit • d delete • Esc cancel", p.width-6))
|
||||
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
@@ -483,7 +483,7 @@ func (p *PresetPicker) formView() string {
|
||||
}
|
||||
sb.WriteString("\n\n")
|
||||
|
||||
sb.WriteString(helpDescStyle.Render("Tab/↓ next • Enter select/save • Esc cancel"))
|
||||
sb.WriteString(WrapHelpText("Tab/↓ next • Enter select/save • Esc cancel", p.width-6))
|
||||
|
||||
return dialogStyle.Render(sb.String())
|
||||
}
|
||||
@@ -536,7 +536,7 @@ func (p *PresetPicker) pickerView() string {
|
||||
|
||||
sb.WriteString(titleStyle.Render(title))
|
||||
sb.WriteString("\n")
|
||||
sb.WriteString(helpDescStyle.Render("Space to toggle • Enter to confirm • Esc to cancel"))
|
||||
sb.WriteString(WrapHelpText("Space to toggle • Enter to confirm • Esc to cancel", p.width-6))
|
||||
sb.WriteString("\n\n")
|
||||
|
||||
filtered := p.getFilteredAliases()
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
package tui
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
)
|
||||
|
||||
@@ -148,3 +150,71 @@ func StatusText(enabled bool, pending bool, hasError bool) string {
|
||||
func HelpItem(key, desc string) string {
|
||||
return helpKeyStyle.Render(key) + " " + helpDescStyle.Render(desc)
|
||||
}
|
||||
|
||||
// WrapHelpText wraps help text to fit within maxWidth, splitting on bullet separators.
|
||||
// If maxWidth is 0 or negative, returns the original text.
|
||||
func WrapHelpText(text string, maxWidth int) string {
|
||||
if maxWidth <= 0 {
|
||||
return helpDescStyle.Render(text)
|
||||
}
|
||||
|
||||
separator := " • "
|
||||
parts := splitOnSeparator(text, separator)
|
||||
|
||||
var lines []string
|
||||
var currentLine string
|
||||
var currentWidth int
|
||||
|
||||
for i, part := range parts {
|
||||
partWidth := len(part)
|
||||
sepWidth := 3 // len(" • ")
|
||||
|
||||
newWidth := currentWidth + partWidth
|
||||
if currentWidth > 0 {
|
||||
newWidth += sepWidth
|
||||
}
|
||||
|
||||
if newWidth > maxWidth && currentWidth > 0 {
|
||||
lines = append(lines, currentLine)
|
||||
currentLine = part
|
||||
currentWidth = partWidth
|
||||
} else {
|
||||
if currentWidth > 0 {
|
||||
currentLine += separator
|
||||
}
|
||||
currentLine += part
|
||||
if i == 0 {
|
||||
currentWidth = partWidth
|
||||
} else {
|
||||
currentWidth = newWidth
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if currentLine != "" {
|
||||
lines = append(lines, currentLine)
|
||||
}
|
||||
|
||||
// Apply style to each line and join
|
||||
var result []string
|
||||
for _, line := range lines {
|
||||
result = append(result, helpDescStyle.Render(line))
|
||||
}
|
||||
|
||||
return strings.Join(result, "\n")
|
||||
}
|
||||
|
||||
// splitOnSeparator splits a string on the given separator.
|
||||
func splitOnSeparator(s, sep string) []string {
|
||||
var parts []string
|
||||
for {
|
||||
idx := strings.Index(s, sep)
|
||||
if idx == -1 {
|
||||
parts = append(parts, s)
|
||||
break
|
||||
}
|
||||
parts = append(parts, s[:idx])
|
||||
s = s[idx+len(sep):]
|
||||
}
|
||||
return parts
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user