1
0
mirror of https://github.com/taigrr/wtf synced 2026-03-26 00:22:21 -07:00

Merge branch 'master' into another_ipinfo_api_187

This commit is contained in:
FengYa
2018-06-09 23:11:12 +08:00
committed by GitHub
50 changed files with 344 additions and 89 deletions

15
wtf.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/rivo/tview"
"github.com/senorprogrammer/wtf/bamboohr"
"github.com/senorprogrammer/wtf/bargraph"
"github.com/senorprogrammer/wtf/cfg"
"github.com/senorprogrammer/wtf/clocks"
"github.com/senorprogrammer/wtf/cmdrunner"
"github.com/senorprogrammer/wtf/cryptoexchanges/bittrex"
@@ -19,6 +20,7 @@ import (
"github.com/senorprogrammer/wtf/gcal"
"github.com/senorprogrammer/wtf/git"
"github.com/senorprogrammer/wtf/github"
"github.com/senorprogrammer/wtf/gspreadsheets"
"github.com/senorprogrammer/wtf/help"
"github.com/senorprogrammer/wtf/ipinfo"
"github.com/senorprogrammer/wtf/ipapi"
@@ -170,6 +172,8 @@ func addWidget(app *tview.Application, pages *tview.Pages, widgetName string) {
switch widgetName {
case "bamboohr":
Widgets = append(Widgets, bamboohr.NewWidget())
case "bargraph":
Widgets = append(Widgets, bargraph.NewWidget())
case "bittrex":
Widgets = append(Widgets, bittrex.NewWidget())
case "clocks":
@@ -184,6 +188,8 @@ func addWidget(app *tview.Application, pages *tview.Pages, widgetName string) {
Widgets = append(Widgets, git.NewWidget(app, pages))
case "github":
Widgets = append(Widgets, github.NewWidget(app, pages))
case "gspreadsheets":
Widgets = append(Widgets, gspreadsheets.NewWidget())
case "ipinfo":
Widgets = append(Widgets, ipinfo.NewWidget())
case "ipapi":
@@ -219,7 +225,7 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
// Always in alphabetical order
bamboohr.Config = Config
bargraph.Config = Config
bargraph.Config = Config
bittrex.Config = Config
clocks.Config = Config
cmdrunner.Config = Config
@@ -227,6 +233,7 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
gcal.Config = Config
git.Config = Config
github.Config = Config
gspreadsheets.Config = Config
ipinfo.Config = Config
ipapi.Config = Config
jira.Config = Config
@@ -258,7 +265,7 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
}
func loadConfig(configFlag string) {
Config = wtf.LoadConfigFile(configFlag)
Config = cfg.LoadConfigFile(configFlag)
}
func main() {
@@ -275,8 +282,8 @@ func main() {
// Responsible for creating the configuration directory and default
// configuration file if they don't already exist
wtf.CreateConfigDir()
wtf.WriteConfigFile()
cfg.CreateConfigDir()
cfg.WriteConfigFile()
loadConfig(cmdFlags.Config)
os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM")))