From f48e5152706f0433605dacf1c5b8f6c432ebd41b Mon Sep 17 00:00:00 2001 From: Eugene Dzhurinsky Date: Tue, 31 Jul 2018 13:50:32 -0400 Subject: [PATCH] Make the cryptolive using the global config reference. Signed-off-by: Eugene Dzhurinsky --- cryptoexchanges/cryptolive/price/widget.go | 19 +++++++---------- cryptoexchanges/cryptolive/toplist/widget.go | 22 +++++++++----------- cryptoexchanges/cryptolive/widget.go | 7 ------- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/cryptoexchanges/cryptolive/price/widget.go b/cryptoexchanges/cryptolive/price/widget.go index 85c5deb0..e7db0dc6 100644 --- a/cryptoexchanges/cryptolive/price/widget.go +++ b/cryptoexchanges/cryptolive/price/widget.go @@ -7,12 +7,9 @@ import ( "sync" "time" - "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" ) -// Config is a pointer to the global config object -var Config *config.Config - var baseURL = "https://min-api.cryptocompare.com/data/price" var ok = true @@ -35,12 +32,12 @@ func NewWidget() *Widget { } func (widget *Widget) setList() { - currenciesMap, _ := Config.Map("wtf.mods.cryptolive.currencies") + currenciesMap, _ := wtf.Config.Map("wtf.mods.cryptolive.currencies") widget.list = &list{} for currency := range currenciesMap { - displayName, _ := Config.String("wtf.mods.cryptolive.currencies." + currency + ".displayName") + displayName, _ := wtf.Config.String("wtf.mods.cryptolive.currencies." + currency + ".displayName") toList := getToList(currency) widget.list.addItem(currency, displayName, toList) } @@ -70,10 +67,10 @@ func (widget *Widget) Refresh(wg *sync.WaitGroup) { func (widget *Widget) display() { str := "" var ( - fromNameColor = Config.UString("wtf.mods.cryptolive.colors.from.name", "coral") - fromDisplayNameColor = Config.UString("wtf.mods.cryptolive.colors.from.displayName", "grey") - toNameColor = Config.UString("wtf.mods.cryptolive.colors.to.name", "white") - toPriceColor = Config.UString("wtf.mods.cryptolive.colors.to.price", "green") + fromNameColor = wtf.Config.UString("wtf.mods.cryptolive.colors.from.name", "coral") + fromDisplayNameColor = wtf.Config.UString("wtf.mods.cryptolive.colors.from.displayName", "grey") + toNameColor = wtf.Config.UString("wtf.mods.cryptolive.colors.to.name", "white") + toPriceColor = wtf.Config.UString("wtf.mods.cryptolive.colors.to.price", "green") ) for _, item := range widget.list.items { str += fmt.Sprintf(" [%s]%s[%s] (%s)\n", fromNameColor, item.displayName, fromDisplayNameColor, item.name) @@ -87,7 +84,7 @@ func (widget *Widget) display() { } func getToList(fromName string) []*toCurrency { - toNames, _ := Config.List("wtf.mods.cryptolive.currencies." + fromName + ".to") + toNames, _ := wtf.Config.List("wtf.mods.cryptolive.currencies." + fromName + ".to") var toList []*toCurrency diff --git a/cryptoexchanges/cryptolive/toplist/widget.go b/cryptoexchanges/cryptolive/toplist/widget.go index feb95332..a9aeafae 100644 --- a/cryptoexchanges/cryptolive/toplist/widget.go +++ b/cryptoexchanges/cryptolive/toplist/widget.go @@ -8,11 +8,9 @@ import ( "sync" "time" - "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" ) -// Config is a pointer to the global config object -var Config *config.Config var baseURL = "https://min-api.cryptocompare.com/data/top/exchanges" type textColors struct { @@ -50,17 +48,17 @@ func NewWidget() *Widget { } func (widget *Widget) setList() { - currenciesMap, _ := Config.Map("wtf.mods.cryptolive.top") + currenciesMap, _ := wtf.Config.Map("wtf.mods.cryptolive.top") for fromCurrency := range currenciesMap { - displayName := Config.UString("wtf.mods.cryptolive.top."+fromCurrency+".displayName", "") - limit := Config.UInt("wtf.mods.cryptolive.top."+fromCurrency+".limit", 1) + displayName := wtf.Config.UString("wtf.mods.cryptolive.top."+fromCurrency+".displayName", "") + limit := wtf.Config.UInt("wtf.mods.cryptolive.top."+fromCurrency+".limit", 1) widget.list.addItem(fromCurrency, displayName, limit, makeToList(fromCurrency, limit)) } } func makeToList(fCurrencyName string, limit int) (list []*tCurrency) { - toList, _ := Config.List("wtf.mods.cryptolive.top." + fCurrencyName + ".to") + toList, _ := wtf.Config.List("wtf.mods.cryptolive.top." + fCurrencyName + ".to") for _, toCurrency := range toList { list = append(list, &tCurrency{ @@ -74,11 +72,11 @@ func makeToList(fCurrencyName string, limit int) (list []*tCurrency) { func (widget *Widget) config() { // set colors - widget.colors.from.name = Config.UString("wtf.mods.cryptolive.colors.top.from.name", "coral") - widget.colors.from.displayName = Config.UString("wtf.mods.cryptolive.colors.top.from.displayName", "grey") - widget.colors.to.name = Config.UString("wtf.mods.cryptolive.colors.top.to.name", "red") - widget.colors.to.field = Config.UString("wtf.mods.cryptolive.colors.top.to.field", "white") - widget.colors.to.value = Config.UString("wtf.mods.cryptolive.colors.top.to.value", "value") + widget.colors.from.name = wtf.Config.UString("wtf.mods.cryptolive.colors.top.from.name", "coral") + widget.colors.from.displayName = wtf.Config.UString("wtf.mods.cryptolive.colors.top.from.displayName", "grey") + widget.colors.to.name = wtf.Config.UString("wtf.mods.cryptolive.colors.top.to.name", "red") + widget.colors.to.field = wtf.Config.UString("wtf.mods.cryptolive.colors.top.to.field", "white") + widget.colors.to.value = wtf.Config.UString("wtf.mods.cryptolive.colors.top.to.value", "value") } /* -------------------- Exported Functions -------------------- */ diff --git a/cryptoexchanges/cryptolive/widget.go b/cryptoexchanges/cryptolive/widget.go index 150b4ed7..07331a83 100644 --- a/cryptoexchanges/cryptolive/widget.go +++ b/cryptoexchanges/cryptolive/widget.go @@ -4,15 +4,11 @@ import ( "fmt" "sync" - "github.com/olebedev/config" "github.com/senorprogrammer/wtf/cryptoexchanges/cryptolive/price" "github.com/senorprogrammer/wtf/cryptoexchanges/cryptolive/toplist" "github.com/senorprogrammer/wtf/wtf" ) -// Config is a pointer to the global config object -var Config *config.Config - // Widget define wtf widget to register widget later type Widget struct { wtf.TextWidget @@ -22,9 +18,6 @@ type Widget struct { // NewWidget Make new instance of widget func NewWidget() *Widget { - price.Config = Config - toplist.Config = Config - widget := Widget{ TextWidget: wtf.NewTextWidget(" CryptoLive ", "cryptolive", false), priceWidget: price.NewWidget(),