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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.go
View File

@ -64,10 +64,6 @@ func refreshAllWidgets(widgets []wtf.Wtfable) {
} }
func setTerm() { func setTerm() {
err := os.Setenv("TERM", cfg.Config.UString("wtf.term", os.Getenv("TERM")))
if err != nil {
return
}
} }
func watchForConfigChanges(app *tview.Application, configFilePath string, grid *tview.Grid, pages *tview.Pages) { func watchForConfigChanges(app *tview.Application, configFilePath string, grid *tview.Grid, pages *tview.Pages) {
@ -131,7 +127,10 @@ func main() {
defer profile.Start(profile.MemProfile).Stop() defer profile.Start(profile.MemProfile).Stop()
} }
setTerm() err := os.Setenv("TERM", config.UString("wtf.term", os.Getenv("TERM")))
if err != nil {
return
}
app := tview.NewApplication() app := tview.NewApplication()
pages := tview.NewPages() pages := tview.NewPages()

2
modules/git/widget.go
View File

@ -42,7 +42,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget { func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{ widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText), HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "repository", "repositories"), MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "repository", "repositories"),
TextWidget: wtf.NewTextWidget(app, settings.common, true), TextWidget: wtf.NewTextWidget(app, settings.common, true),
app: app, app: app,

2
modules/mercurial/widget.go
View File

@ -37,7 +37,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget { func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{ widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText), HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "repository", "repositories"), MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "repository", "repositories"),
TextWidget: wtf.NewTextWidget(app, settings.common, true), TextWidget: wtf.NewTextWidget(app, settings.common, true),
app: app, app: app,

2
modules/textfile/widget.go
View File

@ -42,7 +42,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget { func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{ widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText), HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "filePath", "filePaths"), MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "filePath", "filePaths"),
TextWidget: wtf.NewTextWidget(app, settings.common, true), TextWidget: wtf.NewTextWidget(app, settings.common, true),
app: app, app: app,

2
modules/twitter/widget.go
View File

@ -38,7 +38,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget { func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{ widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText), HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "screenName", "screenNames"), MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "screenName", "screenNames"),
TextWidget: wtf.NewTextWidget(app, settings.common, true), TextWidget: wtf.NewTextWidget(app, settings.common, true),
app: app, app: app,

15
wtf/multisource_widget.go
View File

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