diff --git a/config.yml b/config.yml index eac2d2a9..e6688a19 100644 --- a/config.yml +++ b/config.yml @@ -1,2 +1,2 @@ wtf: - refresh_interval: 1 + refreshInterval: 1 diff --git a/gcal/client.go b/gcal/client.go index 930c9769..f2577ad6 100644 --- a/gcal/client.go +++ b/gcal/client.go @@ -101,27 +101,23 @@ func Fetch() (*calendar.Events, error) { b, err := ioutil.ReadFile("./gcal/client_secret.json") if err != nil { - //log.Fatalf("Unable to read client secret file: %v", err) return nil, err } config, err := google.ConfigFromJSON(b, calendar.CalendarReadonlyScope) if err != nil { - //log.Fatalf("Unable to parse client secret file to config: %v", err) return nil, err } client := getClient(ctx, config) srv, err := calendar.New(client) if err != nil { - //log.Fatalf("Unable to retrieve calendar Client %v", err) return nil, err } t := today().Format(time.RFC3339) events, err := srv.Events.List("primary").ShowDeleted(false).SingleEvents(true).TimeMin(t).MaxResults(10).OrderBy("startTime").Do() if err != nil { - //log.Fatalf("Unable to retrieve next ten of the user's events. %v", err) return nil, err } diff --git a/wtf.go b/wtf.go index 752b4d74..d259e7d3 100644 --- a/wtf.go +++ b/wtf.go @@ -1,7 +1,7 @@ package main import ( - "fmt" + //"fmt" "time" "github.com/olebedev/config" @@ -16,6 +16,8 @@ import ( "github.com/senorprogrammer/wtf/weather" ) +var Config = loadConfig() + func loadConfig() *config.Config { cfg, err := config.ParseYamlFile("./config.yml") if err != nil { @@ -26,7 +28,12 @@ func loadConfig() *config.Config { } func refresher(stat *status.Widget, app *tview.Application) { - tick := time.NewTicker(1 * time.Second) + refreshInterval, err := Config.Int("wtf.refresh_interval") + if err != nil { + refreshInterval = 1 + } + + tick := time.NewTicker(time.Duration(refreshInterval) * time.Second) quit := make(chan struct{}) for { @@ -41,10 +48,6 @@ func refresher(stat *status.Widget, app *tview.Application) { } func main() { - cfg := loadConfig() - - fmt.Printf("%v\n", cfg) - bamboo := bamboohr.NewWidget() bamboo.Refresh()