adding debug logging toggle

Signed-off-by: Chris Collins <[email protected]>
clcollins · Nov 2, 2023 · ab82e07 · ab82e07
1 parent ebc898e
commit ab82e07
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 22 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -63,18 +63,22 @@ but rather a simple tool to make on-call tasks easier.`,
 		}
 
 		var ctx = context.Background()
-		var config = &pd.Config{}
+		var tuiConfig = &tui.Config{
+			Debug:   Debug,
+			Verbose: false,
+		}
+		var pdConfig = &pd.Config{}
 
 		token := viper.GetString("token")
 		teams := viper.GetStringSlice("teams")
 		silentuser := viper.GetString("silentuser")
 
-		err := config.PopulateConfig(ctx, token, teams, silentuser)
+		err := pdConfig.PopulateConfig(ctx, token, teams, silentuser)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		p := tea.NewProgram(tui.InitialModel(ctx, config))
+		p := tea.NewProgram(tui.InitialModel(ctx, tuiConfig, pdConfig))
 		_, err = p.Run()
 		if err != nil {
 			log.Fatal(err)

diff --git a/pkg/tui/commands.go b/pkg/tui/commands.go
@@ -2,20 +2,19 @@ package tui
 
 import (
 	"context"
-	"log"
 
 	"github.com/PagerDuty/go-pagerduty"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/clcollins/srepd/pkg/pd"
 )
 
+var logLevel = "warn"
+
 type getCurrentUserMsg string
 type gotCurrentUserMsg *pagerduty.User
 
 func getCurrentUser(ctx context.Context, pdConfig *pd.Config) tea.Cmd {
-	if debug {
-		log.Printf("getCurrentUser")
-	}
+	debug("getCurrentUser")
 	return func() tea.Msg {
 		u, err := pdConfig.Client.GetCurrentUserWithContext(ctx, pagerduty.GetCurrentUserOptions{})
 		if err != nil {
@@ -51,9 +50,7 @@ type getIncidentsMsg string
 type gotIncidentsMsg []pagerduty.Incident
 
 func getIncidents(ctx context.Context, pdConfig *pd.Config) tea.Cmd {
-	if debug {
-		log.Printf("getIncidents")
-	}
+	debug("getIncidents")
 	return func() tea.Msg {
 		opts := pagerduty.ListIncidentsOptions{
 			TeamIDs:  pdConfig.DefaultListOpts.TeamIDs,

diff --git a/pkg/tui/table.go b/pkg/tui/table.go
@@ -6,6 +6,8 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
+// TODO: Figure out how to dynamically resize the table and columns based on terminal size
+// and resize tea.Msg events received from the terminal
 const (
 	// Standard terminal size is 80x24
 	// so we have 78 columns to work with after subtracting for the table borders

diff --git a/pkg/tui/tui.go b/pkg/tui/tui.go
@@ -22,7 +22,11 @@ const (
 	gettingSilentUserMsg = "getting 'Silent' user info..."
 )
 
-var debug bool
+type Config struct {
+	Debug   bool
+	Verbose bool
+}
+
 var errorLog []error
 
 // Type and function for capturing error messages with tea.Msg
@@ -32,8 +36,9 @@ func (e errMsg) Error() string { return e.err.Error() }
 
 type model struct {
 	help                  help.Model
-	context               context.Context
+	cliConfig             *Config
 	pdConfig              *pd.Config
+	context               context.Context
 	currentUser           *pagerduty.User
 	incidentList          []pagerduty.Incident
 	selectedIncident      *pagerduty.Incident
@@ -45,18 +50,20 @@ type model struct {
 	// confirm               bool
 }
 
-func InitialModel(ctx context.Context, pdConfig *pd.Config) model {
+func InitialModel(ctx context.Context, config *Config, pdConfig *pd.Config) model {
 	return model{
-		help:     help.New(),
-		context:  ctx,
-		pdConfig: pdConfig,
+		help:      help.New(),
+		context:   ctx,
+		cliConfig: config,
+		pdConfig:  pdConfig,
 	}
 }
 
 func (m model) Init() tea.Cmd {
-	if debug {
-		log.Print("init")
+	if m.cliConfig.Debug {
+		logLevel = "debug"
 	}
+
 	return tea.Batch(
 		func() tea.Msg { return tea.ClearScreen() },
 		func() tea.Msg { return createTableWithStylesMsg("create table") },
@@ -68,9 +75,8 @@ func (m model) Init() tea.Cmd {
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	if debug {
-		log.Print("Update: ", msg)
-	}
+	debug(fmt.Sprintf("Update: %s", msg))
+
 	switch msg := msg.(type) {
 
 	case tea.WindowSizeMsg:
@@ -227,3 +233,9 @@ func (m model) View() string {
 	}
 	return m.renderIncidentTable()
 }
+
+func debug(s string) {
+	if logLevel == "debug" {
+		log.Print(s)
+	}
+}
diff --git a/pkg/tui/views.go b/pkg/tui/views.go
@@ -28,7 +28,7 @@ func (m model) renderIncidentTable() string {
 	}
 
 	//s.WriteString(renderAssigneeArea(assignedTo))
-	//s.WriteString(renderStatusArea(m.statusMessage))
+	s.WriteString(renderStatusArea(m.statusMessage))
 	s.WriteString(renderTableArea(m.table))
 	//s.WriteString(renderHelpArea(m.help.View(defaultKeyMap)))