fix build.yml

Author: watzon

.github/workflows/build.yml

@@ -6,11 +6,13 @@
 name: Build Go binaries
 
 on:
-    push:
-        paths-ignore:
-        - 'docs/release.svg'
-        - 'README.md'
-        - 'CHANGELOG.md'
+  push:
+      paths-ignore:
+      - 'docs/screenshot.png'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - 'LICENSE'
+      - 'Dockerfile'
 
 jobs:
   build:
@@ -25,3 +27,9 @@ jobs:
             SRCPATH: ./cmd/go-up
         with:
             args: darwin/amd64/1 darwin/arm64/1 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64/1 windows/386/1 freebsd/amd64/1
+        
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: go-up
+          path: ./release/go-up_*

go.mod

@@ -5,6 +5,9 @@ go 1.23
 require (
 	github.com/gizak/termui/v3 v3.1.0
 	github.com/spf13/cobra v1.8.1
+	github.com/spf13/viper v1.19.0
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/gorm v1.25.12
 )
 
 require (
@@ -20,7 +23,6 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/viper v1.19.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
@@ -29,14 +31,12 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/driver/sqlite v1.5.6 // indirect
-	gorm.io/gorm v1.25.12 // indirect
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mattn/go-sqlite3 v1.14.24
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
 	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

go.sum

@@ -1,10 +1,16 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc=
 github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -13,6 +19,10 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -29,9 +39,13 @@ github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
@@ -57,6 +71,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
@@ -71,6 +86,8 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/daemon/service.go

@@ -11,7 +11,6 @@ import (
 	"github.com/watzon/go-up/internal/types"
 )
 
-// Service represents the RPC service that will handle requests
 type Service struct {
 	db *database.DB
 }
@@ -20,7 +19,6 @@ func NewService(db *database.DB) *Service {
 	return &Service{db: db}
 }
 
-// ListMonitors handles the RPC call to list monitors
 func (s *Service) ListMonitors(_ struct{}, reply *[]types.Monitor) error {
 	monitors, err := s.db.ListMonitors()
 	if err != nil {
@@ -37,7 +35,6 @@ func (s *Service) AddMonitor(args struct{ Name, URL string }, reply *string) err
 		return err
 	}
 
-	// Fetch initial stats immediately
 	responseTime, isUp, certExpiry := checkService(args.URL)
 	if err := s.db.AddStats(args.Name, int(responseTime.Milliseconds()), isUp, certExpiry); err != nil {
 		log.Printf("Warning: Failed to fetch initial stats for %s: %v", args.Name, err)

internal/database/database.go

@@ -108,18 +108,15 @@ func (db *DB) GetStats(monitorName string, duration time.Duration) (types.Servic
 		return status, err
 	}
 
-	// Create a separate struct for aggregated stats
 	var stats struct {
 		AvgResponseTime float64
 		Uptime24h       float64
 		Uptime30d       float64
 	}
 
-	// Get averages and uptimes
 	dayAgo := time.Now().AddDate(0, 0, -1)
 	monthAgo := time.Now().AddDate(0, 0, -30)
 
-	// Calculate average response time
 	err := db.Model(&Check{}).
 		Where("monitor_id = ? AND timestamp >= ?", monitor.ID, monthAgo).
 		Select("COALESCE(AVG(response_time), 0) as avg_response_time").
@@ -129,7 +126,6 @@ func (db *DB) GetStats(monitorName string, duration time.Duration) (types.Servic
 		return status, err
 	}
 
-	// Calculate 24h uptime
 	var upCount24h, totalCount24h int64
 	err = db.Model(&Check{}).
 		Where("monitor_id = ? AND timestamp >= ?", monitor.ID, dayAgo).
@@ -144,7 +140,6 @@ func (db *DB) GetStats(monitorName string, duration time.Duration) (types.Servic
 		stats.Uptime24h = float64(upCount24h) * 100.0 / float64(totalCount24h)
 	}
 
-	// Calculate 30d uptime
 	var upCount30d, totalCount30d int64
 	err = db.Model(&Check{}).
 		Where("monitor_id = ? AND timestamp >= ?", monitor.ID, monthAgo).
@@ -159,7 +154,6 @@ func (db *DB) GetStats(monitorName string, duration time.Duration) (types.Servic
 		stats.Uptime30d = float64(upCount30d) * 100.0 / float64(totalCount30d)
 	}
 
-	// Get latest check separately
 	var lastCheck Check
 	if err := db.Where("monitor_id = ?", monitor.ID).
 		Order("timestamp DESC").

internal/tui/app.go

@@ -17,7 +17,7 @@ type App struct {
 	debug            *widgets.DebugView
 	help             *widgets.HelpBar
 	monitors         []types.Monitor
-	currentMonitorID int // Add this field
+	currentMonitorID int
 }
 
 func NewApp(debugMode bool, daemonAddr string) (*App, error) {
@@ -47,7 +47,7 @@ func NewApp(debugMode bool, daemonAddr string) (*App, error) {
 
 func (app *App) Run() error {
 	defer termui.Close()
-	defer app.Close() // Make sure we close the RPC client
+	defer app.Close()
 
 	// Initial data fetch and setup
 	if err := app.initialSetup(); err != nil {
@@ -278,15 +278,13 @@ func (app *App) refreshData() error {
 	return nil
 }
 
-// Add this method to App struct
 func (app *App) Close() error {
 	if app.client != nil {
 		return app.client.close()
 	}
 	return nil
 }
 
-// Update the updateSelectedMonitor method
 func (app *App) updateSelectedMonitor(index int) {
 	if index >= len(app.monitors) {
 		return

internal/tui/client.go

@@ -98,7 +98,6 @@ func (c *RPCClient) resumeMonitor(name string) error {
 	return c.call("Service.ResumeMonitor", name, &reply)
 }
 
-// Update the getHistoricalStats method
 func (c *RPCClient) getHistoricalStats(monitorID int, count int, debug *widgets.DebugView) ([]types.HistoricalStat, error) {
 	var stats []types.HistoricalStat
 	args := struct {

internal/tui/widgets/details_panel.go

@@ -18,7 +18,7 @@ type DetailsPanel struct {
 }
 
 func NewDetailsPanel() *DetailsPanel {
-	container := termui.NewBlock() // Changed from widgets.NewBlock() to termui.NewBlock()
+	container := termui.NewBlock()
 	container.Border = true
 	container.BorderStyle = termui.NewStyle(termui.ColorWhite)
 
@@ -79,17 +79,12 @@ func (d *DetailsPanel) Draw(buf *termui.Buffer) {
 	d.Stats.Draw(buf)
 }
 
-// GetRect implements termui.Drawable interface
 func (d *DetailsPanel) GetRect() image.Rectangle {
 	d.Lock()
 	defer d.Unlock()
 	return d.Container.GetRect()
 }
 
-// Lock is already implemented by embedding sync.Mutex
-// Unlock is already implemented by embedding sync.Mutex
-
-// Add this method to DetailsPanel
 func (d *DetailsPanel) InitializeChart(stats []types.HistoricalStat, debug *DebugView) {
 	d.Lock()
 	defer d.Unlock()

internal/tui/widgets/response_chart.go

@@ -10,7 +10,7 @@ type ResponseChart struct {
 	*widgets.BarChart
 	data        []float64
 	labels      []string
-	statuses    []bool // Add this field to track up/down status
+	statuses    []bool
 	storedStats []types.HistoricalStat
 	debug       *DebugView
 }
@@ -27,15 +27,15 @@ func NewResponseChart() *ResponseChart {
 		BarChart: chart,
 		data:     make([]float64, 0),
 		labels:   make([]string, 0),
-		statuses: make([]bool, 0), // Initialize the statuses slice
+		statuses: make([]bool, 0),
 	}
 }
 
 func (c *ResponseChart) Update(status types.ServiceStatus) {
 	// Add new data point
 	responseValue := float64(status.ResponseTime)
 	if !status.CurrentStatus {
-		responseValue = 0 // Use 0 for down status
+		responseValue = 0
 	}
 
 	c.data = append(c.data, responseValue)
@@ -94,12 +94,10 @@ func (c *ResponseChart) Update(status types.ServiceStatus) {
 	c.Labels = c.labels
 }
 
-// Add method to store stats for later initialization
 func (c *ResponseChart) StoreHistoricalStats(stats []types.HistoricalStat) {
 	c.storedStats = stats
 }
 
-// Add method to initialize with current width
 func (c *ResponseChart) InitializeWithCurrentWidth() {
 	if len(c.storedStats) > 0 {
 		width := c.GetRect().Dx()
@@ -115,15 +113,13 @@ func (c *ResponseChart) InitializeWithCurrentWidth() {
 	}
 }
 
-// Add new method to calculate how many bars can fit
 func (c *ResponseChart) CalculateMaxBars(containerWidth int) int {
-	width := containerWidth - 2 // Subtract 2 for padding
+	width := containerWidth - 2
 	// Each bar takes BarWidth + 1 space (bar + gap)
 	// We also need 1 space at the start for padding
 	return (width - 1) / (c.BarWidth + 1)
 }
 
-// Update InitializeHistory to handle the data in the same way
 func (c *ResponseChart) InitializeHistory(stats []types.HistoricalStat, containerWidth int, debug *DebugView) {
 	c.debug = debug
 	if debug != nil {

internal/tui/widgets/service_list.go

@@ -80,8 +80,6 @@ func (s *ServiceList) MoveSelection(delta int, maxIndex int) {
 	}
 }
 
-// Add these methods to ServiceList
-
 func (s *ServiceList) IsPaused(serviceName string) bool {
 	return s.pausedMonitors[serviceName]
 }

internal/types/types.go

@@ -24,7 +24,6 @@ type Monitor struct {
 	IsActive bool
 }
 
-// Add this new type
 type HistoricalStat struct {
 	ResponseTime int
 	IsUp         bool