extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-29 00:11:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support displaying query errors rather than crashing the entire TUI

Browse Source
This commit is contained in:
David Dworken 2022-10-21 23:07:52 -07:00
parent dbf029067f
commit 6464264673
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/lib/tui.go
View File

@ -39,6 +39,7 @@ type model struct {
runQuery string runQuery string
lastQuery string lastQuery string
err error err error
searchErr error
queryInput textinput.Model queryInput textinput.Model
banner string banner string
isOffline bool isOffline bool
@ -74,8 +75,10 @@ func runQueryAndUpdateTable(m model) model {
if m.runQuery != "" && m.runQuery != m.lastQuery { if m.runQuery != "" && m.runQuery != m.lastQuery {
rows, numEntries, err := getRows(m.ctx, m.runQuery) rows, numEntries, err := getRows(m.ctx, m.runQuery)
if err != nil { if err != nil {
m.err = err m.searchErr = err
return m return m
} else {
m.searchErr = nil
} }
m.numEntries = numEntries m.numEntries = numEntries
m.table.SetRows(rows) m.table.SetRows(rows)
@ -147,11 +150,14 @@ func (m model) View() string {
if m.isLoading { if m.isLoading {
loadingMessage = fmt.Sprintf("%s Loading hishtory entries from other devices...", m.spinner.View()) loadingMessage = fmt.Sprintf("%s Loading hishtory entries from other devices...", m.spinner.View())
} }
offlineWarning := "" warning := ""
if m.isOffline { if m.isOffline {
offlineWarning = "Warning: failed to contact the hishtory backend (are you offline?), so some results may be stale\n\n" warning += "Warning: failed to contact the hishtory backend (are you offline?), so some results may be stale\n\n"
} }
return fmt.Sprintf("\n%s\n%s%s\nSearch Query: %s\n\n%s\n", loadingMessage, offlineWarning, m.banner, m.queryInput.View(), baseStyle.Render(m.table.View())) if m.searchErr != nil {
warning += fmt.Sprintf("Warning: failed to search: %v\n\n", m.searchErr)
}
return fmt.Sprintf("\n%s\n%s%s\nSearch Query: %s\n\n%s\n", loadingMessage, warning, m.banner, m.queryInput.View(), baseStyle.Render(m.table.View()))
} }
func getRows(ctx *context.Context, query string) ([]table.Row, int, error) { func getRows(ctx *context.Context, query string) ([]table.Row, int, error) {
@ -189,7 +195,7 @@ func TuiQuery(ctx *context.Context, initialQuery string) error {
} }
t := table.New( t := table.New(
table.WithColumns(columns), table.WithColumns(columns),
table.WithRows(rows), // TODO: need to pad this to always have at least length items table.WithRows(rows),
table.WithFocused(true), table.WithFocused(true),
table.WithHeight(TABLE_HEIGHT), table.WithHeight(TABLE_HEIGHT),
) )
@ -233,5 +239,3 @@ func TuiQuery(ctx *context.Context, initialQuery string) error {
fmt.Printf("%s\n", selectedRow) fmt.Printf("%s\n", selectedRow)
return nil return nil
} }
// TODO: make the tui support `after:` without crashing everyhitng