1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Properly scope Config to the wtf package and remove it as a dependency from everywhere else

This commit is contained in:
Chris Cummer
2018-06-16 14:59:22 -07:00
parent abedee0ce0
commit 66b69471d0
42 changed files with 126 additions and 251 deletions

View File

@@ -7,13 +7,9 @@ import (
"net/http"
"github.com/olebedev/config"
"github.com/senorprogrammer/wtf/wtf"
)
// Config is a pointer to the global config object
var Config *config.Config
type TextColors struct {
base struct {
name string
@@ -55,17 +51,17 @@ func NewWidget() *Widget {
}
func (widget *Widget) config() {
widget.TextColors.base.name = Config.UString("wtf.mods.bittrex.colors.base.name", "red")
widget.TextColors.base.displayName = Config.UString("wtf.mods.bittrex.colors.base.displayName", "grey")
widget.TextColors.market.name = Config.UString("wtf.mods.bittrex.colors.market.name", "red")
widget.TextColors.market.field = Config.UString("wtf.mods.bittrex.colors.market.field", "coral")
widget.TextColors.market.value = Config.UString("wtf.mods.bittrex.colors.market.value", "white")
widget.TextColors.base.name = wtf.Config.UString("wtf.mods.bittrex.colors.base.name", "red")
widget.TextColors.base.displayName = wtf.Config.UString("wtf.mods.bittrex.colors.base.displayName", "grey")
widget.TextColors.market.name = wtf.Config.UString("wtf.mods.bittrex.colors.market.name", "red")
widget.TextColors.market.field = wtf.Config.UString("wtf.mods.bittrex.colors.market.field", "coral")
widget.TextColors.market.value = wtf.Config.UString("wtf.mods.bittrex.colors.market.value", "white")
}
func (widget *Widget) setSummaryList() {
sCurrencies, _ := Config.Map("wtf.mods.bittrex.summary")
sCurrencies, _ := wtf.Config.Map("wtf.mods.bittrex.summary")
for baseCurrencyName := range sCurrencies {
displayName, _ := Config.String("wtf.mods.bittrex.summary." + baseCurrencyName + ".displayName")
displayName, _ := wtf.Config.String("wtf.mods.bittrex.summary." + baseCurrencyName + ".displayName")
mCurrencyList := makeSummaryMarketList(baseCurrencyName)
widget.summaryList.addSummaryItem(baseCurrencyName, displayName, mCurrencyList)
}
@@ -74,7 +70,7 @@ func (widget *Widget) setSummaryList() {
func makeSummaryMarketList(currencyName string) []*mCurrency {
mCurrencyList := []*mCurrency{}
configMarketList, _ := Config.List("wtf.mods.bittrex.summary." + currencyName + ".market")
configMarketList, _ := wtf.Config.List("wtf.mods.bittrex.summary." + currencyName + ".market")
for _, mCurrencyName := range configMarketList {
mCurrencyList = append(mCurrencyList, makeMarketCurrency(mCurrencyName.(string)))
}