From 334c39da640dfc5ac596a67f26412981f3175929 Mon Sep 17 00:00:00 2001 From: sqshq Date: Mon, 20 May 2019 23:18:23 -0400 Subject: [PATCH] statusbar messages improvements --- component/statusbar.go | 34 +++++++++++++++++++++------------- console/console.go | 2 +- main.go | 23 ++++++++++++----------- storage/stats.go | 2 ++ 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/component/statusbar.go b/component/statusbar.go index d8eb989..3cef5b8 100644 --- a/component/statusbar.go +++ b/component/statusbar.go @@ -4,6 +4,7 @@ import ( "fmt" ui "github.com/gizak/termui/v3" "github.com/sqshq/sampler/console" + "github.com/sqshq/sampler/storage" "image" ) @@ -13,19 +14,30 @@ const ( type StatusBar struct { *ui.Block - keyBindings []string - configFileName string + keyBindings []string + text string } -func NewStatusLine(configFileName string, palette console.Palette) *StatusBar { +func NewStatusLine(configFileName string, palette console.Palette, license *storage.License) *StatusBar { block := *ui.NewBlock() block.Border = false + + text := fmt.Sprintf(" %s %s | ", console.AppTitle, console.AppVersion) + + if license == nil || !license.Purchased || !license.Valid { + text += console.AppLicenseWarning + } else if license.Username != nil { + text += fmt.Sprintf("%s | licensed to %s", configFileName, *license.Username) + } else { + text += fmt.Sprintf("%s | licensed to %s", configFileName, *license.Company) + } + return &StatusBar{ - Block: NewBlock("", false, palette), - configFileName: configFileName, + Block: NewBlock("", false, palette), + text: text, keyBindings: []string{ - "(Q) quit", - "(P) pause", + "(q) quit", + "(p) pause", "(<->) selection", "(ESC) reset alerts", }, @@ -33,13 +45,9 @@ func NewStatusLine(configFileName string, palette console.Palette) *StatusBar { } func (s *StatusBar) Draw(buffer *ui.Buffer) { - buffer.Fill(ui.NewCell(' ', ui.NewStyle(console.ColorClear, console.MenuColorBackground)), s.GetRect()) - if false { // TODO check license - buffer.SetString(fmt.Sprintf(" %s", console.AppLicenseWarning), ui.NewStyle(console.MenuColorText, console.MenuColorBackground), s.Min) - } else { - buffer.SetString(fmt.Sprintf(" %s %s @ %s", console.AppTitle, console.AppVersion, s.configFileName), ui.NewStyle(console.MenuColorText, console.MenuColorBackground), s.Min) - } + buffer.Fill(ui.NewCell(' ', ui.NewStyle(console.ColorClear, console.MenuColorBackground)), s.GetRect()) + buffer.SetString(s.text, ui.NewStyle(console.MenuColorText, console.MenuColorBackground), s.Min) indent := bindingsIndent for _, binding := range s.keyBindings { diff --git a/console/console.go b/console/console.go index fd25f9b..09c1be1 100644 --- a/console/console.go +++ b/console/console.go @@ -14,7 +14,7 @@ const ( RowsCount = 40 AppTitle = "sampler" AppVersion = "0.9.0" - AppLicenseWarning = "UNLICENSED. FOR PERSONAL USE ONLY. VISIT SAMPLER.DEV" + AppLicenseWarning = "UNLICENSED. FOR PERSONAL USE ONLY. VISIT WWW.SAMPLER.DEV" ) const ( diff --git a/main.go b/main.go index 68605dc..779f95f 100644 --- a/main.go +++ b/main.go @@ -48,10 +48,20 @@ func main() { palette := console.GetPalette(*cfg.Theme) width, height := ui.TerminalDimensions() - lout := layout.NewLayout(width, height, component.NewStatusLine(opt.ConfigFile, palette), component.NewMenu(palette), component.NewIntro(palette)) + license := storage.GetLicense() + // TODO storage.UpdateStats() + + lout := layout.NewLayout(width, height, component.NewStatusLine(opt.ConfigFile, palette, license), component.NewMenu(palette), component.NewIntro(palette)) starter := &Starter{lout, player, opt, cfg} - license := storage.GetLicense() + if license == nil { + lout.RunIntro() + storage.InitLicense() + } else if !license.Purchased /* && random */ { + // TODO lout.showNagWindow() with timeout and OK button + // TODO verify license + // TODO send stats + } for _, c := range cfg.RunCharts { cpt := runchart.NewRunChart(c, palette) @@ -83,15 +93,6 @@ func main() { starter.start(cpt, cpt.Consumer, c.ComponentConfig, []config.Item{c.Item}, c.Triggers) } - if license == nil { - lout.RunIntro() - storage.InitLicense() - } else if !license.Purchased /* && random */ { - // TODO lout.showNagWindow() with timeout and OK button - // TODO verify license - // TODO send stats - } - handler := event.NewHandler(lout, opt) handler.HandleEvents() } diff --git a/storage/stats.go b/storage/stats.go index eceebd3..962dcf1 100644 --- a/storage/stats.go +++ b/storage/stats.go @@ -4,3 +4,5 @@ package storage // version // launch count // components count by type +// OS +// window size