Working charm, all tables open but only test data

This commit is contained in:
Pablu
2025-10-29 10:49:25 +01:00
parent 3e21282608
commit 027aad1374

View File

@@ -4,6 +4,7 @@ import (
"log" "log"
"os" "os"
"strconv" "strconv"
"strings"
engine "git.pablu.de/pablu/sqv-engine" engine "git.pablu.de/pablu/sqv-engine"
"github.com/charmbracelet/bubbles/table" "github.com/charmbracelet/bubbles/table"
@@ -15,12 +16,29 @@ var baseStyle = lipgloss.NewStyle().
BorderStyle(lipgloss.NormalBorder()). BorderStyle(lipgloss.NormalBorder()).
BorderForeground(lipgloss.Color("240")) BorderForeground(lipgloss.Color("240"))
func tabBorderWithBottom(left, middle, right string) lipgloss.Border {
border := lipgloss.RoundedBorder()
border.BottomLeft = left
border.Bottom = middle
border.BottomRight = right
return border
}
var (
inactiveTabBorder = tabBorderWithBottom("┴", "─", "┴")
activeTabBorder = tabBorderWithBottom("┘", " ", "└")
docStyle = lipgloss.NewStyle().Padding(1, 2, 1, 2)
highlightColor = lipgloss.AdaptiveColor{Light: "#874BFD", Dark: "#7D56F4"}
inactiveTabStyle = lipgloss.NewStyle().Border(inactiveTabBorder, true).BorderForeground(highlightColor).Padding(0, 1)
activeTabStyle = inactiveTabStyle.Border(activeTabBorder, true)
windowStyle = lipgloss.NewStyle().BorderForeground(highlightColor).Padding(2, 0).Align(lipgloss.Center).Border(lipgloss.NormalBorder()).UnsetBorderTop()
)
type model struct { type model struct {
table table.Model tables []table.Model
tableNames []string
currTableName string currTable int
manager *engine.Manager
} }
func (m model) Init() tea.Cmd { func (m model) Init() tea.Cmd {
@@ -32,39 +50,65 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) { switch msg := msg.(type) {
case tea.KeyMsg: case tea.KeyMsg:
switch msg.String() { switch msg.String() {
case "esc":
if m.table.Focused() {
m.table.Blur()
} else {
m.table.Focus()
}
case "ctrl+c", "q": case "ctrl+c", "q":
return m, tea.Quit return m, tea.Quit
case "enter": case "right", "l", "n", "tab":
return m, tea.Batch( m.currTable = min(m.currTable+1, len(m.tables)-1)
tea.Printf("Let's go to %s!", m.table.SelectedRow()[1]), return m, nil
) case "left", "h", "p", "shift+tab":
case "n": m.currTable = max(m.currTable-1, 0)
return m, updateTable(m.manager, m.currTableName) return m, nil
} }
case newTableMsg:
m.table.SetRows(msg.rows)
m.table.SetColumns(msg.columns)
} }
m.table, cmd = m.table.Update(msg)
m.tables[m.currTable], cmd = m.tables[m.currTable].Update(msg)
return m, cmd return m, cmd
} }
type newTableMsg struct { func (m model) View() string {
columns []table.Column doc := strings.Builder{}
rows []table.Row
var renderedTabs []string
for i, t := range m.tableNames {
var style lipgloss.Style
isFirst, isLast, isActive := i == 0, i == len(m.tables)-1, i == m.currTable
if isActive {
style = activeTabStyle
} else {
style = inactiveTabStyle
}
border, _, _, _, _ := style.GetBorder()
if isFirst && isActive {
border.BottomLeft = "│"
} else if isFirst && !isActive {
border.BottomLeft = "├"
} else if isLast && isActive {
border.BottomRight = "│"
} else if isLast && !isActive {
border.BottomRight = "┤"
} }
func updateTable(m *engine.Manager, tableName string) tea.Cmd { style = style.Border(border)
return func() tea.Msg { renderedTabs = append(renderedTabs, style.Render(t))
t, _ := m.GetTable(tableName) }
row := lipgloss.JoinHorizontal(lipgloss.Top, renderedTabs...)
doc.WriteString(row)
doc.WriteString("\n")
doc.WriteString(windowStyle.Width((lipgloss.Width(row) - windowStyle.GetHorizontalFrameSize())).Render(m.tables[m.currTable].View()))
return docStyle.Render(doc.String())
// return baseStyle.Render(m.table.View()) + "\n"
}
func convertToViewTable(m *engine.Manager) ([]string, []table.Model) {
tables := m.GetTables()
res := make([]table.Model, len(tables))
resNames := make([]string, len(tables))
for j, t := range tables {
columns := make([]table.Column, len(t.Columns)) columns := make([]table.Column, len(t.Columns))
for i, column := range t.Columns { for i, column := range t.Columns {
columns[i] = table.Column{ columns[i] = table.Column{
@@ -73,10 +117,10 @@ func updateTable(m *engine.Manager, tableName string) tea.Cmd {
} }
} }
for range 5 { for k := range 50 {
row := engine.Row{Values: make([]string, len(t.Columns))} row := engine.Row{Values: make([]string, len(t.Columns))}
for i := range t.Columns { for i := range t.Columns {
row.Values[i] = "test " + strconv.Itoa(i) row.Values[i] = "test " + strconv.Itoa(k)
} }
t.Rows = append(t.Rows, row) t.Rows = append(t.Rows, row)
} }
@@ -86,46 +130,7 @@ func updateTable(m *engine.Manager, tableName string) tea.Cmd {
rows[i] = row.Values rows[i] = row.Values
} }
return newTableMsg{columns: columns, rows: rows} resTable := table.New(
}
}
func (m model) View() string {
return baseStyle.Render(m.table.View()) + "\n"
}
func main() {
file, err := os.ReadFile("test.sql")
if err != nil {
log.Fatal(err)
}
m := engine.NewManagerFromFile(string(file))
m.Start()
lobby, _ := m.GetTable("lobbys")
lobby.Rows = []engine.Row{
{Values: []string{"1", "me@pablu.de", "1"}},
{Values: []string{"2", "pablu23@gmx.de", "2"}},
{Values: []string{"5", "max@mustermann.org", "5"}},
{Values: []string{"8", "eins@zwei.de", "8"}},
{Values: []string{"19", "heinz.bongo@katzen.us", "19"}},
{Values: []string{"22", "thessa@katze.de", "22"}},
}
columns := make([]table.Column, len(lobby.Columns))
for i, column := range lobby.Columns {
columns[i] = table.Column{
Title: column.Name,
Width: 10,
}
}
rows := make([]table.Row, len(lobby.Rows))
for i, row := range lobby.Rows {
rows[i] = row.Values
}
t := table.New(
table.WithColumns(columns), table.WithColumns(columns),
table.WithRows(rows), table.WithRows(rows),
table.WithFocused(true), table.WithFocused(true),
@@ -142,9 +147,27 @@ func main() {
Foreground(lipgloss.Color("229")). Foreground(lipgloss.Color("229")).
Background(lipgloss.Color("57")). Background(lipgloss.Color("57")).
Bold(false) Bold(false)
t.SetStyles(s) resTable.SetStyles(s)
p := tea.NewProgram(model{table: t, manager: m, currTableName: lobby.Name}) resNames[j] = t.Name
res[j] = resTable
}
return resNames, res
}
func main() {
file, err := os.ReadFile("test.sql")
if err != nil {
log.Fatal(err)
}
m := engine.NewManagerFromFile(string(file))
m.Start()
tableNames, tables := convertToViewTable(m)
p := tea.NewProgram(model{tables: tables, tableNames: tableNames}, tea.WithAltScreen())
if _, err := p.Run(); err != nil { if _, err := p.Run(); err != nil {
log.Fatalf("Alas, theres been an error: %v", err) log.Fatalf("Alas, theres been an error: %v", err)
} }