taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Rip out two more instances of global config

Browse Source 
One setting TERM environment variable
Another in multisource widget
This commit is contained in:
Sean Smith
2019-04-27 15:24:08 -04:00
parent bcf899df72
commit 2d7cafa3bf
6 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wtf/multisource_widget.go
View File

@@ -1,26 +1,24 @@
package wtf
import (
"fmt"
"github.com/wtfutil/wtf/cfg"
)
type MultiSourceWidget struct {
module string
singular string
plural string
moduleConfig *cfg.Common
singular string
plural string
DisplayFunction func()
Idx int
Sources []string
}
func NewMultiSourceWidget(module, singular, plural string) MultiSourceWidget {
func NewMultiSourceWidget(moduleConfig *cfg.Common, singular, plural string) MultiSourceWidget {
return MultiSourceWidget{
module: module,
singular: singular,
plural: plural,
moduleConfig: moduleConfig,
singular: singular,
plural: plural,
}
}
@@ -37,11 +35,8 @@ func (widget *MultiSourceWidget) CurrentSource() string {
func (widget *MultiSourceWidget) LoadSources() {
var empty []interface{}
s := fmt.Sprintf("wtf.mods.%s.%s", widget.module, widget.singular)
p := fmt.Sprintf("wtf.mods.%s.%s", widget.module, widget.plural)
single := cfg.Config.UString(s, "")
multiple := cfg.Config.UList(p, empty)
single := widget.moduleConfig.Config.UString(widget.singular, "")
multiple := widget.moduleConfig.Config.UList(widget.plural, empty)
asStrs := ToStrs(multiple)