mirror of
https://github.com/lukaszraczylo/lolcathost.git
synced 2026-11-19 09:35:24 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90e0375a83 | ||
|
|
8445e50dc8 | ||
|
|
e1b9c15a2a | ||
|
|
c442eade9e | ||
|
|
acc80882e2 | ||
|
|
5e24b13595 | ||
|
|
76e364ca3e |
@@ -5,6 +5,10 @@ on:
|
|||||||
- cron: "0 3 * * *"
|
- cron: "0 3 * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prepare:
|
prepare:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -40,8 +44,18 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: CI_RUN=${CI} go test -v ./...
|
run: CI_RUN=${CI} go test -v ./...
|
||||||
|
|
||||||
|
- name: Configure git safe directory
|
||||||
|
run: git config --global --add safe.directory /__w/lolcathost/lolcathost
|
||||||
|
|
||||||
- name: Commit changes
|
- name: Commit changes
|
||||||
|
id: auto-commit
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
with:
|
with:
|
||||||
commit_message: "Update go.mod and go.sum"
|
commit_message: "Update go.mod and go.sum"
|
||||||
file_pattern: "go.mod go.sum"
|
file_pattern: "go.mod go.sum"
|
||||||
|
|
||||||
|
- name: Trigger release workflow
|
||||||
|
if: steps.auto-commit.outputs.changes_detected == 'true'
|
||||||
|
run: gh workflow run release.yml
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ require (
|
|||||||
github.com/charmbracelet/x/ansi v0.11.2 // indirect
|
github.com/charmbracelet/x/ansi v0.11.2 // indirect
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
||||||
github.com/charmbracelet/x/term v0.2.2 // indirect
|
github.com/charmbracelet/x/term v0.2.2 // indirect
|
||||||
github.com/clipperhouse/displaywidth v0.6.0 // indirect
|
github.com/clipperhouse/displaywidth v0.6.1 // indirect
|
||||||
github.com/clipperhouse/stringish v0.1.1 // indirect
|
github.com/clipperhouse/stringish v0.1.1 // indirect
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
|
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payR
|
|||||||
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
||||||
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
||||||
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
||||||
github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
|
github.com/clipperhouse/displaywidth v0.6.1 h1:/zMlAezfDzT2xy6acHBzwIfyu2ic0hgkT83UX5EY2gY=
|
||||||
github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
github.com/clipperhouse/displaywidth v0.6.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
||||||
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
||||||
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
|
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
|
||||||
|
|||||||
@@ -219,6 +219,21 @@ func TestServer_HandleDelete(t *testing.T) {
|
|||||||
assert.Equal(t, "ok", resp.Status)
|
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) {
|
t.Run("delete nonexistent", func(t *testing.T) {
|
||||||
req, _ := protocol.NewRequest(protocol.RequestDelete, protocol.DeletePayload{
|
req, _ := protocol.NewRequest(protocol.RequestDelete, protocol.DeletePayload{
|
||||||
Alias: "nonexistent",
|
Alias: "nonexistent",
|
||||||
|
|||||||
+68
-9
@@ -9,6 +9,7 @@ import (
|
|||||||
|
|
||||||
"github.com/charmbracelet/bubbles/textinput"
|
"github.com/charmbracelet/bubbles/textinput"
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
"github.com/charmbracelet/lipgloss"
|
||||||
|
|
||||||
"github.com/lukaszraczylo/lolcathost/internal/client"
|
"github.com/lukaszraczylo/lolcathost/internal/client"
|
||||||
"github.com/lukaszraczylo/lolcathost/internal/config"
|
"github.com/lukaszraczylo/lolcathost/internal/config"
|
||||||
@@ -27,6 +28,7 @@ const (
|
|||||||
ViewBackups
|
ViewBackups
|
||||||
ViewHelp
|
ViewHelp
|
||||||
ViewSearch
|
ViewSearch
|
||||||
|
ViewConfirmDelete
|
||||||
)
|
)
|
||||||
|
|
||||||
// Model is the main Bubble Tea model.
|
// Model is the main Bubble Tea model.
|
||||||
@@ -45,13 +47,14 @@ type Model struct {
|
|||||||
searchInput textinput.Model
|
searchInput textinput.Model
|
||||||
|
|
||||||
// State
|
// State
|
||||||
width int
|
width int
|
||||||
height int
|
height int
|
||||||
message string
|
message string
|
||||||
messageStyle string // "error" or "success"
|
messageStyle string // "error" or "success"
|
||||||
messageTime time.Time
|
messageTime time.Time
|
||||||
searchTerm string
|
searchTerm string
|
||||||
allGroups []string // All groups including empty ones
|
allGroups []string // All groups including empty ones
|
||||||
|
pendingDeleteAlias string // Alias of host pending delete confirmation
|
||||||
|
|
||||||
// Update notification
|
// Update notification
|
||||||
updateAvailable bool
|
updateAvailable bool
|
||||||
@@ -352,7 +355,8 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
// Mark as disconnected to trigger reconnect
|
// Mark as disconnected to trigger reconnect
|
||||||
m.connected = false
|
m.connected = false
|
||||||
m.client.Close()
|
m.client.Close()
|
||||||
} else if msg.entries != nil {
|
} else {
|
||||||
|
// Always update the list, even if entries is nil/empty
|
||||||
m.list.SetItems(msg.entries)
|
m.list.SetItems(msg.entries)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -385,7 +389,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
m.mode = ViewList
|
m.mode = ViewList
|
||||||
|
|
||||||
case deleteMsg:
|
case deleteMsg:
|
||||||
|
// Clear pending state regardless of success/failure
|
||||||
|
m.list.SetPending(msg.alias, false)
|
||||||
if msg.err != nil {
|
if msg.err != nil {
|
||||||
|
m.list.SetError(msg.alias, true)
|
||||||
m.setError(fmt.Sprintf("Delete failed: %v", msg.err))
|
m.setError(fmt.Sprintf("Delete failed: %v", msg.err))
|
||||||
} else {
|
} else {
|
||||||
cmds = append(cmds, m.refresh())
|
cmds = append(cmds, m.refresh())
|
||||||
@@ -521,6 +528,8 @@ func (m *Model) handleKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
return m.handleHelpKey(msg)
|
return m.handleHelpKey(msg)
|
||||||
case ViewSearch:
|
case ViewSearch:
|
||||||
return m.handleSearchKey(msg)
|
return m.handleSearchKey(msg)
|
||||||
|
case ViewConfirmDelete:
|
||||||
|
return m.handleConfirmDeleteKey(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -554,7 +563,8 @@ func (m *Model) handleListKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
}
|
}
|
||||||
case "d":
|
case "d":
|
||||||
if item := m.list.Selected(); item != nil {
|
if item := m.list.Selected(); item != nil {
|
||||||
return m.deleteHost(item.Entry.Alias)
|
m.pendingDeleteAlias = item.Entry.Alias
|
||||||
|
m.mode = ViewConfirmDelete
|
||||||
}
|
}
|
||||||
case "p":
|
case "p":
|
||||||
m.mode = ViewPresets
|
m.mode = ViewPresets
|
||||||
@@ -850,6 +860,23 @@ func (m *Model) handleSearchKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
return 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 {
|
func (m *Model) toggleSelected() tea.Cmd {
|
||||||
item := m.list.Selected()
|
item := m.list.Selected()
|
||||||
if item == nil {
|
if item == nil {
|
||||||
@@ -904,6 +931,8 @@ func (m *Model) View() string {
|
|||||||
sb.WriteString(m.helpView())
|
sb.WriteString(m.helpView())
|
||||||
case ViewSearch:
|
case ViewSearch:
|
||||||
sb.WriteString(m.searchView())
|
sb.WriteString(m.searchView())
|
||||||
|
case ViewConfirmDelete:
|
||||||
|
sb.WriteString(m.confirmDeleteView())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Message
|
// Message
|
||||||
@@ -1077,6 +1106,36 @@ func (m *Model) searchView() string {
|
|||||||
return dialogStyle.Render(sb.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.
|
// Run starts the TUI application.
|
||||||
func Run(socketPath string) error {
|
func Run(socketPath string) error {
|
||||||
return RunWithVersion(socketPath, "dev", "", "")
|
return RunWithVersion(socketPath, "dev", "", "")
|
||||||
|
|||||||
@@ -295,11 +295,6 @@ func (l *ListView) ViewFiltered(searchTerm string) string {
|
|||||||
return sb.String()
|
return sb.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
// GroupCount returns the number of groups.
|
|
||||||
func (l *ListView) GroupCount() int {
|
|
||||||
return len(l.groupOrder)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetGroups returns all group names.
|
// GetGroups returns all group names.
|
||||||
func (l *ListView) GetGroups() []string {
|
func (l *ListView) GetGroups() []string {
|
||||||
return l.groupOrder
|
return l.groupOrder
|
||||||
|
|||||||
@@ -407,3 +407,72 @@ func BenchmarkListView_View(b *testing.B) {
|
|||||||
_ = lv.View()
|
_ = 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)
|
||||||
|
}
|
||||||
|
|||||||
@@ -146,11 +146,6 @@ func StatusText(enabled bool, pending bool, hasError bool) string {
|
|||||||
return disabledStyle.Render("○ Disabled")
|
return disabledStyle.Render("○ Disabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
// HelpItem formats a help item.
|
|
||||||
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.
|
// WrapHelpText wraps help text to fit within maxWidth, splitting on bullet separators.
|
||||||
// If maxWidth is 0 or negative, returns the original text.
|
// If maxWidth is 0 or negative, returns the original text.
|
||||||
func WrapHelpText(text string, maxWidth int) string {
|
func WrapHelpText(text string, maxWidth int) string {
|
||||||
|
|||||||
Reference in New Issue
Block a user