diff --git a/config.yml b/config.yml index 3c3cfa75..fb4438f6 100644 --- a/config.yml +++ b/config.yml @@ -4,7 +4,9 @@ wtf: refreshInterval: 900 url: "https://api.bamboohr.com/api/gateway.php" gcal: + eventCount: 10 refreshInterval: 300 + secretFile: "~/.wtf/gcal/client_secret.json" git: refreshInterval: 8 jira: diff --git a/gcal/client.go b/gcal/client.go index ef8ed024..bf7f080a 100644 --- a/gcal/client.go +++ b/gcal/client.go @@ -17,6 +17,7 @@ import ( "path/filepath" "time" + "github.com/senorprogrammer/wtf/homedir" "golang.org/x/net/context" "golang.org/x/oauth2" "golang.org/x/oauth2/google" @@ -28,7 +29,9 @@ import ( func Fetch() (*calendar.Events, error) { ctx := context.Background() - b, err := ioutil.ReadFile("./gcal/client_secret.json") + secretPath, _ := homedir.Expand(Config.UString("wtf.gcal.secretFile")) + + b, err := ioutil.ReadFile(secretPath) if err != nil { return nil, err } @@ -45,7 +48,7 @@ func Fetch() (*calendar.Events, error) { } t := today().Format(time.RFC3339) - events, err := srv.Events.List("primary").ShowDeleted(false).SingleEvents(true).TimeMin(t).MaxResults(10).OrderBy("startTime").Do() + events, err := srv.Events.List("primary").ShowDeleted(false).SingleEvents(true).TimeMin(t).MaxResults(int64(Config.UInt("wtf.gcal.eventCount", 10))).OrderBy("startTime").Do() if err != nil { return nil, err }