From b93af3a6b9c8ade47aeb43164fcf866b91876bf9 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 10 May 2023 18:36:13 +0200 Subject: [PATCH] refactor: use same naming scheme --- gshmm.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gshmm.go b/gshmm.go index 103f3c3..9ec41ef 100644 --- a/gshmm.go +++ b/gshmm.go @@ -62,12 +62,12 @@ func readPDF(name string) (string, error) { type model struct { filterInput textinput.Model // Fuzzy search interface datasheets []datasheet // All datasheets under cwd - dataSheetsView []string // Filtered view on all datasheets - dataSheetViewport viewport.Model // Viewport for the PDF content + datasheetsView []string // Filtered view on all datasheets + datasheetViewport viewport.Model // Viewport for the PDF content } -// dataSheetNames lists all datasheet names. -func (m model) dataSheetNames() []string { +// datasheetNames lists all datasheet names. +func (m model) datasheetNames() []string { // TODO: cache this somewhere, it's called several times... in the model? var names []string for _, datasheet := range m.datasheets { @@ -130,9 +130,9 @@ func initialModel() model { m := model{ filterInput: input, datasheets: ds, - dataSheetViewport: viewp, + datasheetViewport: viewp, } - m.dataSheetsView = m.dataSheetNames() + m.datasheetsView = m.datasheetNames() return m } @@ -154,26 +154,26 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { search := m.filterInput.Value() if len(search) >= minCharsUntilFilter { - matches := fuzzy.Find(search, m.dataSheetNames()) + matches := fuzzy.Find(search, m.datasheetNames()) for _, match := range matches { matched = append(matched, match.Str) } if len(matches) > 0 { - m.dataSheetsView = matched + m.datasheetsView = matched } else { - m.dataSheetsView = m.dataSheetNames() + m.datasheetsView = m.datasheetNames() } } else { - m.dataSheetsView = m.dataSheetNames() + m.datasheetsView = m.datasheetNames() } // TODO: implement cursor for scrolling up/down filtered // results so we can view the PDF contents as desired // it's currently just the last one (closest to input) - lastDatasheet := m.dataSheetsView[len(m.dataSheetsView)-1] - viewportText := m.datasheetFromName(lastDatasheet) - m.dataSheetViewport.SetContent(viewportText) + lastdatasheet := m.datasheetsView[len(m.datasheetsView)-1] + viewportText := m.datasheetFromName(lastdatasheet) + m.datasheetViewport.SetContent(viewportText) } // TODO: handle terminal resizing @@ -188,7 +188,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.filterInput, cmd = m.filterInput.Update(msg) cmds = append(cmds, cmd) - m.dataSheetViewport, cmd = m.dataSheetViewport.Update(msg) + m.datasheetViewport, cmd = m.datasheetViewport.Update(msg) cmds = append(cmds, cmd) return m, tea.Batch(cmds...) @@ -199,10 +199,10 @@ func (m model) View() string { body := strings.Builder{} // TODO: paginate / trim view to last 10 or something? - sheets := strings.Join(m.dataSheetsView, "\n") + sheets := strings.Join(m.datasheetsView, "\n") // TODO: style further with lipgloss, e.g. borders, margins, etc. - panes := lipgloss.JoinHorizontal(lipgloss.Left, sheets, m.dataSheetViewport.View()) + panes := lipgloss.JoinHorizontal(lipgloss.Left, sheets, m.datasheetViewport.View()) body.WriteString(panes)