Introduce a way to support user defined configurations

This is by no means perfect, but its again taking a few small steps to
make minor improvements and introduce some new functionality which I was
really missing.

app/app.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
+
+	"github.com/jorgerojas26/lazysql/models"
 )
 
 var (
@@ -19,6 +21,7 @@ var (
 type Application struct {
 	*tview.Application
 
+	config    *Config
 	context   context.Context
 	cancelFn  context.CancelFunc
 	waitGroup sync.WaitGroup
@@ -35,6 +38,7 @@ func init() {
 
 	App = &Application{
 		Application: tview.NewApplication(),
+		config:      defaultConfig(),
 		context:     ctx,
 		cancelFn:    cancel,
 	}
@@ -68,6 +72,21 @@ func (a *Application) Context() context.Context {
 	return a.context
 }
 
+// Config returns the application configuration.
+func (a *Application) Config() *models.AppConfig {
+	return a.config.AppConfig
+}
+
+// Connections returns the database connections.
+func (a *Application) Connections() []models.Connection {
+	return a.config.Connections
+}
+
+// SaveConnections saves the database connections.
+func (a *Application) SaveConnections(connections []models.Connection) error {
+	return a.config.SaveConnections(connections)
+}
+
 // Register adds a task to the wait group and returns a
 // function that decrements the task count when called.
 //

helpers/config.go → app/config.go

@@ -1,4 +1,4 @@
-package helpers
+package app
 
 import (
 	"os"
@@ -10,38 +10,33 @@ import (
 )
 
 type Config struct {
+	AppConfig   *models.AppConfig   `toml:"application"`
 	Connections []models.Connection `toml:"database"`
 }
 
-func LoadConfig() (config Config, err error) {
-	file, err := os.ReadFile(filepath.Join(os.Getenv("HOME"), ".config", "lazysql", "config.toml"))
-	if err != nil {
-		return
+func defaultConfig() *Config {
+	return &Config{
+		AppConfig: &models.AppConfig{
+			DefaultPageSize: 300,
+		},
 	}
-
-	err = toml.Unmarshal(file, &config)
-
-	return
 }
 
-func LoadConnections() (connections []models.Connection, err error) {
-	config, err := LoadConfig()
+func LoadConfig() error {
+	file, err := os.ReadFile(filepath.Join(os.Getenv("HOME"), ".config", "lazysql", "config.toml"))
 	if err != nil {
-		return
+		return err
 	}
-
-	connections = config.Connections
-
-	return
+	return toml.Unmarshal(file, App.config)
 }
 
-func SaveConnectionConfig(connections []models.Connection) (err error) {
-	config := Config{Connections: connections}
+func (c *Config) SaveConnections(connections []models.Connection) error {
+	c.Connections = connections
 
 	directoriesPath := filepath.Join(os.Getenv("HOME"), ".config", "lazysql")
 	configFilePath := filepath.Join(directoriesPath, "config.toml")
 
-	err = os.MkdirAll(directoriesPath, 0755)
+	err := os.MkdirAll(directoriesPath, 0o755)
 	if err != nil {
 		return err
 	}
@@ -50,10 +45,7 @@ func SaveConnectionConfig(connections []models.Connection) (err error) {
 	if err != nil {
 		return err
 	}
-
 	defer file.Close()
 
-	err = toml.NewEncoder(file).Encode(config)
-
-	return err
+	return toml.NewEncoder(file).Encode(c)
 }

components/arg_connection.go

@@ -41,7 +41,7 @@ func InitFromArg(connectionString string) error {
 	if err != nil {
 		return fmt.Errorf("Could not connect to database %s: %s", connectionString, err)
 	}
-	MainPages.AddAndSwitchToPage(connection.URL, NewHomePage(connection, newDBDriver).Flex, true)
+	mainPages.AddAndSwitchToPage(connection.URL, NewHomePage(connection, newDBDriver).Flex, true)
 
 	return nil
 }

components/connection_form.go

@@ -95,7 +95,7 @@ func (form *ConnectionForm) inputCapture(connectionPages *models.ConnectionPages
 				return event
 			}
 
-			databases, _ := helpers.LoadConnections()
+			databases := app.App.Connections()
 			newDatabases := make([]models.Connection, len(databases))
 
 			DBName := strings.Split(parsed.Normalize(",", "NULL", 0), ",")[3]
@@ -115,15 +115,15 @@ func (form *ConnectionForm) inputCapture(connectionPages *models.ConnectionPages
 			case actionNewConnection:
 
 				newDatabases = append(databases, parsedDatabaseData)
-				err := helpers.SaveConnectionConfig(newDatabases)
+				err := app.App.SaveConnections(newDatabases)
 				if err != nil {
 					form.StatusText.SetText(err.Error()).SetTextStyle(tcell.StyleDefault.Foreground(tcell.ColorRed))
 					return event
 				}
 
 			case actionEditConnection:
 				newDatabases = make([]models.Connection, len(databases))
-				row, _ := ConnectionListTable.GetSelection()
+				row, _ := connectionsTable.GetSelection()
 
 				for i, database := range databases {
 					if i == row {
@@ -143,15 +143,15 @@ func (form *ConnectionForm) inputCapture(connectionPages *models.ConnectionPages
 					}
 				}
 
-				err := helpers.SaveConnectionConfig(newDatabases)
+				err := app.App.SaveConnections(newDatabases)
 				if err != nil {
 					form.StatusText.SetText(err.Error()).SetTextStyle(tcell.StyleDefault.Foreground(tcell.ColorRed))
 					return event
 
 				}
 			}
 
-			ConnectionListTable.SetConnections(newDatabases)
+			connectionsTable.SetConnections(newDatabases)
 			connectionPages.SwitchToPage(pageNameConnectionSelection)
 
 		} else if event.Key() == tcell.KeyF2 {

components/connection_selection.go

@@ -19,8 +19,6 @@ type ConnectionSelection struct {
 	StatusText *tview.TextView
 }
 
-var ConnectionListTable = NewConnectionsTable()
-
 func NewConnectionSelection(connectionForm *ConnectionForm, connectionPages *models.ConnectionPages) *ConnectionSelection {
 	wrapper := tview.NewFlex()
 
@@ -66,7 +64,7 @@ func NewConnectionSelection(connectionForm *ConnectionForm, connectionPages *mod
 	statusText := tview.NewTextView()
 	statusText.SetBorderPadding(1, 1, 0, 0)
 
-	wrapper.AddItem(ConnectionListTable, 0, 1, true)
+	wrapper.AddItem(NewConnectionsTable(), 0, 1, true)
 	wrapper.AddItem(statusText, 4, 0, false)
 	wrapper.AddItem(buttonsWrapper, 3, 0, false)
 
@@ -76,12 +74,12 @@ func NewConnectionSelection(connectionForm *ConnectionForm, connectionPages *mod
 	}
 
 	wrapper.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		connections := ConnectionListTable.GetConnections()
+		connections := connectionsTable.GetConnections()
 
 		command := app.Keymaps.Group(app.ConnectionGroup).Resolve(event)
 
 		if len(connections) != 0 {
-			row, _ := ConnectionListTable.GetSelection()
+			row, _ := connectionsTable.GetSelection()
 			selectedConnection := connections[row]
 
 			switch command {
@@ -99,23 +97,23 @@ func NewConnectionSelection(connectionForm *ConnectionForm, connectionPages *mod
 				confirmationModal := NewConfirmationModal("")
 
 				confirmationModal.SetDoneFunc(func(_ int, buttonLabel string) {
-					MainPages.RemovePage(pageNameConfirmation)
+					mainPages.RemovePage(pageNameConfirmation)
 					confirmationModal = nil
 
 					if buttonLabel == "Yes" {
 						newConnections := append(connections[:row], connections[row+1:]...)
 
-						err := helpers.SaveConnectionConfig(newConnections)
+						err := app.App.SaveConnections(newConnections)
 						if err != nil {
-							ConnectionListTable.SetError(err)
+							connectionsTable.SetError(err)
 						} else {
-							ConnectionListTable.SetConnections(newConnections)
+							connectionsTable.SetConnections(newConnections)
 						}
 
 					}
 				})
 
-				MainPages.AddPage(pageNameConfirmation, confirmationModal, true, true)
+				mainPages.AddPage(pageNameConfirmation, confirmationModal, true, true)
 
 				return nil
 			}
@@ -141,8 +139,8 @@ func NewConnectionSelection(connectionForm *ConnectionForm, connectionPages *mod
 }
 
 func (cs *ConnectionSelection) Connect(connection models.Connection) *tview.Application {
-	if MainPages.HasPage(connection.Name) {
-		MainPages.SwitchToPage(connection.Name)
+	if mainPages.HasPage(connection.Name) {
+		mainPages.SwitchToPage(connection.Name)
 		return App.Draw()
 	}
 
@@ -202,16 +200,16 @@ func (cs *ConnectionSelection) Connect(connection models.Connection) *tview.Appl
 		return App.Draw()
 	}
 
-	selectedRow, selectedCol := ConnectionListTable.GetSelection()
-	cell := ConnectionListTable.GetCell(selectedRow, selectedCol)
+	selectedRow, selectedCol := connectionsTable.GetSelection()
+	cell := connectionsTable.GetCell(selectedRow, selectedCol)
 	cell.SetText(fmt.Sprintf("[green]* %s", cell.Text))
 	cs.StatusText.SetText("")
 
 	newHome := NewHomePage(connection, newDBDriver)
 	newHome.Tree.SetCurrentNode(newHome.Tree.GetRoot())
 	newHome.Tree.Wrapper.SetTitle(connection.Name)
 
-	MainPages.AddAndSwitchToPage(connection.Name, newHome, true)
+	mainPages.AddAndSwitchToPage(connection.Name, newHome, true)
 	App.SetFocus(newHome.Tree)
 
 	return App.Draw()

components/connections_table.go

@@ -5,7 +5,6 @@ import (
 	"github.com/rivo/tview"
 
 	"github.com/jorgerojas26/lazysql/app"
-	"github.com/jorgerojas26/lazysql/helpers"
 	"github.com/jorgerojas26/lazysql/models"
 )
 
@@ -17,6 +16,8 @@ type ConnectionsTable struct {
 	connections   []models.Connection
 }
 
+var connectionsTable *ConnectionsTable
+
 func NewConnectionsTable() *ConnectionsTable {
 	wrapper := tview.NewFlex()
 
@@ -33,23 +34,16 @@ func NewConnectionsTable() *ConnectionsTable {
 	table.SetSelectedStyle(tcell.StyleDefault.Foreground(app.Styles.SecondaryTextColor).Background(tview.Styles.PrimitiveBackgroundColor))
 
 	wrapper.AddItem(table, 0, 1, true)
+	table.SetConnections(app.App.Connections())
 
-	connections, err := helpers.LoadConnections()
-
-	if err != nil {
-		table.SetError(err)
-	} else {
-		table.SetConnections(connections)
-	}
+	connectionsTable = table
 
-	return table
+	return connectionsTable
 }
 
 func (ct *ConnectionsTable) AddConnection(connection models.Connection) {
 	rowCount := ct.GetRowCount()
-
 	ct.SetCellSimple(rowCount, 0, connection.Name)
-
 	ct.connections = append(ct.connections, connection)
 }
 

components/help_modal.go

@@ -75,7 +75,7 @@ func NewHelpModal() *HelpModal {
 	table.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		command := app.Keymaps.Group(app.HomeGroup).Resolve(event)
 		if command == commands.Quit || command == commands.HelpPopup || event.Key() == tcell.KeyEsc {
-			MainPages.RemovePage(pageNameHelp)
+			mainPages.RemovePage(pageNameHelp)
 		}
 		return event
 	})

components/home.go

@@ -74,7 +74,7 @@ func NewHomePage(connection models.Connection, dbdriver drivers.Driver) *Home {
 		}
 	})
 
-	MainPages.AddPage(connection.URL, home, true, false)
+	mainPages.AddPage(connection.URL, home, true, false)
 	return home
 }
 
@@ -109,7 +109,9 @@ func (home *Home) subscribeToTreeChanges() {
 				home.focusLeftWrapper()
 			})
 
-			if len(results) > 1 && !table.GetShowSidebar() { // 1 because the row 0 is the column names
+			// Show sidebar if there is more then 1 row (row 0 are
+			// the column names) and the sidebar is not disabled.
+			if !App.Config().DisableSidebar && len(results) > 1 && !table.GetShowSidebar() {
 				table.ShowSidebar(true)
 			}
 
@@ -296,7 +298,7 @@ func (home *Home) homeInputCapture(event *tcell.EventKey) *tcell.EventKey {
 		App.ForceDraw()
 	case commands.SwitchToConnectionsView:
 		if (table != nil && !table.GetIsEditing() && !table.GetIsFiltering() && !table.GetIsLoading()) || table == nil {
-			MainPages.SwitchToPage(pageNameConnections)
+			mainPages.SwitchToPage(pageNameConnections)
 		}
 	case commands.Quit:
 		if tab == nil || (!table.GetIsEditing() && !table.GetIsFiltering()) {
@@ -307,7 +309,7 @@ func (home *Home) homeInputCapture(event *tcell.EventKey) *tcell.EventKey {
 			confirmationModal := NewConfirmationModal("")
 
 			confirmationModal.SetDoneFunc(func(_ int, buttonLabel string) {
-				MainPages.RemovePage(pageNameConfirmation)
+				mainPages.RemovePage(pageNameConfirmation)
 				confirmationModal = nil
 
 				if buttonLabel == "Yes" {
@@ -327,7 +329,7 @@ func (home *Home) homeInputCapture(event *tcell.EventKey) *tcell.EventKey {
 				}
 			})
 
-			MainPages.AddPage(pageNameConfirmation, confirmationModal, true, true)
+			mainPages.AddPage(pageNameConfirmation, confirmationModal, true, true)
 		}
 	case commands.HelpPopup:
 		if table == nil || !table.GetIsEditing() {
@@ -340,7 +342,7 @@ func (home *Home) homeInputCapture(event *tcell.EventKey) *tcell.EventKey {
 			// 	}
 			// 	return event
 			// })
-			MainPages.AddPage(pageNameHelp, home.HelpModal, true, true)
+			mainPages.AddPage(pageNameHelp, home.HelpModal, true, true)
 		}
 	}
 

components/pages.go

@@ -6,9 +6,11 @@ import (
 	"github.com/jorgerojas26/lazysql/app"
 )
 
-var MainPages = tview.NewPages()
+var mainPages *tview.Pages
 
-func init() {
-	MainPages.SetBackgroundColor(app.Styles.PrimitiveBackgroundColor)
-	MainPages.AddPage(pageNameConnections, NewConnectionPages().Flex, true, true)
+func MainPages() *tview.Pages {
+	mainPages = tview.NewPages()
+	mainPages.SetBackgroundColor(app.Styles.PrimitiveBackgroundColor)
+	mainPages.AddPage(pageNameConnections, NewConnectionPages().Flex, true, true)
+	return mainPages
 }