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

Don't display calendar until() time if in the past

Browse Source
This commit is contained in:
Chris Cummer 2018-04-03 16:33:26 -07:00 committed by Chris Cummer
parent 12e6b2a9f2
commit faa4a915c4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcal/widget.go
View File

@ -117,6 +117,10 @@ func (widget *Widget) until(start time.Time) string {
duration = duration.Round(time.Minute) duration = duration.Round(time.Minute)
if duration < 0 {
return ""
}
days := duration / (24 * time.Hour) days := duration / (24 * time.Hour)
duration -= days * (24 * time.Hour) duration -= days * (24 * time.Hour)

11
weather/client.go
View File

@ -6,15 +6,24 @@ import (
owm "github.com/briandowns/openweathermap" owm "github.com/briandowns/openweathermap"
) )
/* -------------------- Exported Functions -------------------- */
func Fetch() *owm.CurrentWeatherData { func Fetch() *owm.CurrentWeatherData {
apiKey := os.Getenv("WTF_OWM_API_KEY") apiKey := os.Getenv("WTF_OWM_API_KEY")
vancouver := 6173331
return currentWeather(apiKey, vancouver)
}
/* -------------------- Unexported Functions -------------------- */
func currentWeather(apiKey string, cityCode int) *owm.CurrentWeatherData {
weather, err := owm.NewCurrent("C", "EN", apiKey) weather, err := owm.NewCurrent("C", "EN", apiKey)
if err != nil { if err != nil {
panic(err) panic(err)
} }
weather.CurrentByID(6173331) weather.CurrentByID(cityCode)
return weather return weather
} }