Add interactive filter/selection tool (#58)

cmd/pager.go

@@ -1,120 +0,0 @@
-package cmd
-
-// pager setup using bubbletea
-// file shamlelessly copied from:
-// https://github.com/charmbracelet/bubbletea/tree/main/examples/pager
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/charmbracelet/bubbles/viewport"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
-)
-
-var (
-	titleStyle = func() lipgloss.Style {
-		b := lipgloss.RoundedBorder()
-		b.Right = "├"
-		return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
-	}()
-
-	infoStyle = func() lipgloss.Style {
-		b := lipgloss.RoundedBorder()
-		b.Left = "┤"
-		return titleStyle.BorderStyle(b)
-	}()
-)
-
-type model struct {
-	content  string
-	title    string
-	ready    bool
-	viewport viewport.Model
-}
-
-func (m model) Init() tea.Cmd {
-	return nil
-}
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var (
-		cmd  tea.Cmd
-		cmds []tea.Cmd
-	)
-
-	switch msg := msg.(type) {
-	case tea.KeyMsg:
-		if k := msg.String(); k == "ctrl+c" || k == "q" || k == "esc" {
-			return m, tea.Quit
-		}
-
-	case tea.WindowSizeMsg:
-		headerHeight := lipgloss.Height(m.headerView())
-		footerHeight := lipgloss.Height(m.footerView())
-		verticalMarginHeight := headerHeight + footerHeight
-
-		if !m.ready {
-			// Since this program is using the full size of the viewport we
-			// need to wait until we've received the window dimensions before
-			// we can initialize the viewport. The initial dimensions come in
-			// quickly, though asynchronously, which is why we wait for them
-			// here.
-			m.viewport = viewport.New(msg.Width, msg.Height-verticalMarginHeight)
-			m.viewport.YPosition = headerHeight
-			m.viewport.SetContent(m.content)
-			m.ready = true
-		} else {
-			m.viewport.Width = msg.Width
-			m.viewport.Height = msg.Height - verticalMarginHeight
-		}
-	}
-
-	// Handle keyboard and mouse events in the viewport
-	m.viewport, cmd = m.viewport.Update(msg)
-	cmds = append(cmds, cmd)
-
-	return m, tea.Batch(cmds...)
-}
-
-func (m model) View() string {
-	if !m.ready {
-		return "\n  Initializing..."
-	}
-	return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
-}
-
-func (m model) headerView() string {
-	// title := titleStyle.Render("RPN Help Overview")
-	title := titleStyle.Render(m.title)
-	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
-	return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
-}
-
-func (m model) footerView() string {
-	info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
-	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
-	return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func Pager(title, message string) {
-	p := tea.NewProgram(
-		model{content: message, title: title},
-		tea.WithAltScreen(),       // use the full size of the terminal in its "alternate screen buffer"
-		tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
-	)
-
-	if _, err := p.Run(); err != nil {
-		fmt.Println("could not run pager:", err)
-		os.Exit(1)
-	}
-}

cmd/root.go

@@ -73,7 +73,7 @@ func Execute() {
 			}
 
 			if ShowManual {
-				Pager("tablizer manual page", manpage)
+				lib.Pager("tablizer manual page", manpage)
 
 				return
 			}
@@ -130,6 +130,8 @@ func Execute() {
 		"Yank the speficied columns (separated by ,) to the clipboard")
 	rootCmd.PersistentFlags().StringVarP(&conf.TransposeColumns, "transpose-columns", "T", "",
 		"Transpose the speficied columns (separated by ,)")
+	rootCmd.PersistentFlags().BoolVarP(&conf.Interactive, "interactive", "I", false,
+		"interactive mode (experimental)")
 
 	// sort options
 	rootCmd.PersistentFlags().StringVarP(&conf.SortByColumn, "sort-by", "k", "",

cmd/tablizer.go

@@ -20,6 +20,7 @@ SYNOPSIS
           -F, --filter field[!]=reg         Filter given field with regex, can be used multiple times
           -T, --transpose-columns string    Transpose the speficied columns (separated by ,)
           -R, --regex-transposer /from/to/  Apply /search/replace/ regexp to fields given in -T
+          -I, --interactive                 Interactively filter and select rows
 
         Output Flags (mutually exclusive):
           -X, --extended                    Enable extended output
@@ -189,6 +190,20 @@ DESCRIPTION
 
     If the option -v is specified, the filtering is inverted.
 
+  INTERACTIVE FILTERING
+    You can also use the interactive mode, enabled with "-I" to filter and
+    select rows. This mode is complementary, that is, other filter options
+    are still being respected.
+
+    To enter e filter, hit "/", enter a filter string and finish with
+    "ENTER". Use "SPACE" to select/deselect rows, use "a" to select all
+    (visible) rows.
+
+    Commit your selection with "q". The selected rows are being fed to the
+    requested output mode as usual. Abort with "CTRL-c", in which case the
+    results of the interactive mode are being ignored and all rows are being
+    fed to output.
+
   COLUMNS
     The parameter -c can be used to specify, which columns to display. By
     default tablizer numerizes the header names and these numbers can be
@@ -416,6 +431,9 @@ LICENSE
         Released under the MIT License, Copyright (c) 2006-2011 Kirill
         Simonov
 
+    bubble-table (https://github.com/Evertras/bubble-table)
+        Released under the MIT License, Copyright (c) 2022 Brandon Fulljames
+
 AUTHORS
     Thomas von Dein tom AT vondein DOT org
 
@@ -437,6 +455,7 @@ Operational Flags:
   -F, --filter field[!]=reg         Filter given field with regex, can be used multiple times
   -T, --transpose-columns string    Transpose the speficied columns (separated by ,)
   -R, --regex-transposer /from/to/  Apply /search/replace/ regexp to fields given in -T
+  -I, --interactive                 Interactively filter and select rows
 
 Output Flags (mutually exclusive):
   -X, --extended                    Enable extended output