From 9e6abb1112503ede506d28d3f770d0185d65df60 Mon Sep 17 00:00:00 2001 From: Sam Fredrickson Date: Fri, 29 Mar 2024 01:15:59 -0700 Subject: [PATCH] Naming things is hard. --- config/config.go | 35 ++++++++++++++++------------------- moon/moon.go | 20 -------------------- tui/asset/asset.go | 36 ++++++++++++++++++++++++++++-------- tui/tui.go | 9 ++++----- 4 files changed, 48 insertions(+), 52 deletions(-) diff --git a/config/config.go b/config/config.go index 437f18c..a597e64 100644 --- a/config/config.go +++ b/config/config.go @@ -16,62 +16,59 @@ import ( var k = koanf.New(".") -func Load(path string) (all All, err error) { +func Load(filePath string) (r Root, err error) { err = k.Load(structs.Provider(Default, "koanf"), nil) if err != nil { return } - if path != "" { - err = k.Load(file.Provider(path), yaml.Parser()) + if filePath != "" { + err = k.Load(file.Provider(filePath), yaml.Parser()) if err != nil { return } } - err = k.Unmarshal("", &all) - if err != nil { - return - } + err = k.Unmarshal("", &r) return } -var Default All +var Default Root -type All struct { - Defaults Data `koanf:"defaults"` - Assets map[coindesk.Asset]Data `koanf:"assets"` +type Root struct { + Defaults Asset `koanf:"defaults"` + Assets map[coindesk.Asset]Asset `koanf:"assets"` } -type Data struct { +type Asset struct { Asset coindesk.Asset `koanf:"asset"` Goals []moon.Goal `koanf:"goals"` ConstantBases []moon.ConstantBase `koanf:"constantBases"` RelativeBases []moon.RelativeBase `koanf:"relativeBases"` } -func (all All) GetData(asset coindesk.Asset) (data Data) { - data, ok := all.Assets[asset] +func (r Root) ForAsset(asset coindesk.Asset) (data Asset) { + data, ok := r.Assets[asset] if !ok { - data = all.Defaults + data = r.Defaults } if data.Asset == "" { data.Asset = asset } if data.Goals == nil || len(data.Goals) == 0 { - data.Goals = all.Defaults.Goals + data.Goals = r.Defaults.Goals } if data.ConstantBases == nil || len(data.ConstantBases) == 0 { - data.ConstantBases = all.Defaults.ConstantBases + data.ConstantBases = r.Defaults.ConstantBases } if data.RelativeBases == nil || len(data.RelativeBases) == 0 { - data.RelativeBases = all.Defaults.RelativeBases + data.RelativeBases = r.Defaults.RelativeBases } return } // GetBases returns the concatenation of the constant and relative bases, sorted // from most recent to least recent in time. -func GetBases(d *Data) (bases []moon.Base) { +func GetBases(d *Asset) (bases []moon.Base) { for _, b := range d.ConstantBases { bases = append(bases, b) } diff --git a/moon/moon.go b/moon/moon.go index 07a6f51..ed6ae5e 100644 --- a/moon/moon.go +++ b/moon/moon.go @@ -2,7 +2,6 @@ package moon import ( "context" - "fmt" "math" "time" @@ -115,25 +114,6 @@ type Column struct { Projections Projection } -func (c *Column) Column() (entries []string) { - entries = append(entries, fmt.Sprintf("$%.2f", c.StartingPrice)) - entries = append(entries, fmt.Sprintf("%.2f%%", (c.CDPR-1)*100)) - never := c.CDPR <= 1 - for i := range c.Projections.Dates { - var cell string - if never { - cell = "NEVER!!!!!" - } else { - cell = c. - Projections. - Dates[i]. - Format("2006-01-02") - } - entries = append(entries, cell) - } - return -} - var DefaultGoals = []Goal{ {"$100k", 100000}, {"$150k", 150000}, diff --git a/tui/asset/asset.go b/tui/asset/asset.go index b1611fd..68b320e 100644 --- a/tui/asset/asset.go +++ b/tui/asset/asset.go @@ -30,7 +30,7 @@ type Msg struct { inner tea.Msg } -func New(cfg config.Data) (m Model) { +func New(cfg config.Asset) (m Model) { m.math = moon.NewMath( cfg.Asset, cfg.Goals, @@ -89,10 +89,6 @@ func New(cfg config.Data) (m Model) { return } -func (m Model) Handles(a coindesk.Asset) bool { - return m.math.Asset == a -} - func (m Model) Init() tea.Cmd { return tea.Batch( m.indicator.Tick, @@ -102,6 +98,10 @@ func (m Model) Init() tea.Cmd { ) } +func (m Model) Handles(a coindesk.Asset) bool { + return m.math.Asset == a +} + func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) { switch msg := msg.(type) { case Msg: @@ -195,14 +195,34 @@ func refillProperties(m *Model) { } func refillProjections(m *Model) { - rows := []table.Row{m.math.Labels} + cols := []table.Row{m.math.Labels} for i := range m.math.Columns { - rows = append(rows, m.math.Columns[i].Column()) + entries := renderEntries(m.math.Columns[i]) + cols = append(cols, entries) } - rows = transpose(rows) + rows := transpose(cols) m.projections.SetRows(rows) } +func renderEntries(c moon.Column) (entries []string) { + entries = append(entries, fmt.Sprintf("$%.2f", c.StartingPrice)) + entries = append(entries, fmt.Sprintf("%.2f%%", (c.CDPR-1)*100)) + never := c.CDPR <= 1 + for i := range c.Projections.Dates { + var cell string + if never { + cell = "NEVER!!!!!" + } else { + cell = c. + Projections. + Dates[i]. + Format("2006-01-02") + } + entries = append(entries, cell) + } + return +} + func transpose(slice []table.Row) []table.Row { xl := len(slice[0]) yl := len(slice) diff --git a/tui/tui.go b/tui/tui.go index 0e6146b..95f9205 100644 --- a/tui/tui.go +++ b/tui/tui.go @@ -17,17 +17,16 @@ type Model struct { displayStats bool } -func New(assets []coindesk.Asset, cfg config.All, displayStats bool) (m Model) { +func New(assets []coindesk.Asset, cfg config.Root, displayStats bool) (m Model) { m.stats = perf.New() m.displayStats = displayStats - // construct models for each asset, but don't filter out dupes + // construct models for each asset, but remove dupes seen := map[coindesk.Asset]struct{}{} for _, a := range assets { - _, ok := seen[a] - if ok { + if _, ok := seen[a]; ok { continue } - assetCfg := cfg.GetData(a) + assetCfg := cfg.ForAsset(a) assetModel := asset.New(assetCfg) m.assets = append(m.assets, assetModel) seen[a] = struct{}{}