1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Remove complexity from a lot of string display statements

This commit is contained in:
Chris Cummer
2018-06-21 19:32:32 -07:00
parent 24a46a652b
commit 1a898b05e3
27 changed files with 85 additions and 86 deletions

View File

@@ -1,7 +1,6 @@
package prettyweather
import (
"fmt"
"io/ioutil"
"net/http"
"strings"
@@ -29,7 +28,7 @@ func (widget *Widget) Refresh() {
widget.UpdateRefreshedAt()
widget.prettyWeather()
widget.View.SetText(fmt.Sprintf("%s", widget.result))
widget.View.SetText(widget.result)
}
//this method reads the config and calls wttr.in for pretty weather
@@ -40,21 +39,24 @@ func (widget *Widget) prettyWeather() {
widget.view = wtf.Config.UString("wtf.mods.prettyweather.view", "0")
req, err := http.NewRequest("GET", "https://wttr.in/"+widget.city+"?"+widget.view+"?"+widget.unit, nil)
if err != nil {
widget.result = fmt.Sprintf("%s", err.Error())
widget.result = err.Error()
return
}
req.Header.Set("User-Agent", "curl")
response, err := client.Do(req)
if err != nil {
widget.result = fmt.Sprintf("%s", err.Error())
widget.result = err.Error()
return
}
defer response.Body.Close()
contents, err := ioutil.ReadAll(response.Body)
if err != nil {
widget.result = fmt.Sprintf("%s", err.Error())
widget.result = err.Error()
return
}
widget.result = fmt.Sprintf("%s", strings.TrimSpace(string(contents)))
widget.result = strings.TrimSpace(string(contents))
}