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

20191215 code improvements (#790)

Browse Source 
* Upgrade godo to latest
* Fix a bunch of issues found by
* Running staticcheck on a codebase for the first time is a sobering experience
* go mod tidy
* More static improvements

Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2019-12-16 20:25:29 -08:00
committed by GitHub
parent e71038ccf2
commit 3a388fba23
65 changed files with 236 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/weatherservices/arpansagovau/client.go
View File

@@ -11,43 +11,42 @@ type Stations struct {
XMLName xml.Name `xml:"stations"`
Text string `xml:",chardata"`
Location []struct {
Text string `xml:",chardata"`
ID string `xml:"id,attr"`
Name string `xml:"name"` // adl, ali, bri, can, cas, ...
Index float32 `xml:"index"` // 0.0, 0.0, 0.0, 0.0, 0.0, ...
Time string `xml:"time"` // 7:24 PM, 7:24 PM, 7:54 PM...
Date string `xml:"date"` // 29/08/2019, 29/08/2019, 2...
Fulldate string `xml:"fulldate"` // Thursday, 29 August 2019,...
Utcdatetime string `xml:"utcdatetime"` // 2019/08/29 09:54, 2019/08...
Status string `xml:"status"` // ok, ok, ok, ok, ok, ok, o...
Text string `xml:",chardata"`
ID string `xml:"id,attr"`
Name string `xml:"name"` // adl, ali, bri, can, cas, ...
Index float32 `xml:"index"` // 0.0, 0.0, 0.0, 0.0, 0.0, ...
Time string `xml:"time"` // 7:24 PM, 7:24 PM, 7:54 PM...
Date string `xml:"date"` // 29/08/2019, 29/08/2019, 2...
Fulldate string `xml:"fulldate"` // Thursday, 29 August 2019,...
Utcdatetime string `xml:"utcdatetime"` // 2019/08/29 09:54, 2019/08...
Status string `xml:"status"` // ok, ok, ok, ok, ok, ok, o...
} `xml:"location"`
}
type location struct {
name string
index float32
time string
date string
name string
index float32
time string
date string
status string
}
func GetLocationData(cityname string) (*location, error) {
var locdata location;
var locdata location
resp, err := apiRequest()
if err != nil {
return nil, err
}
stations, err := parseXML(resp.Body);
if(err != nil) {
stations, err := parseXML(resp.Body)
if err != nil {
return nil, err
}
for _, city := range stations.Location {
if(city.ID == cityname) {
locdata = location { name: city.ID, index: city.Index, time: city.Time, date: city.Date, status: city.Status }
break;
if city.ID == cityname {
locdata = location{name: city.ID, index: city.Index, time: city.Time, date: city.Date, status: city.Status}
break
}
}
return &locdata, err
@@ -57,6 +56,9 @@ func GetLocationData(cityname string) (*location, error) {
func apiRequest() (*http.Response, error) {
req, err := http.NewRequest("GET", "https://uvdata.arpansa.gov.au/xml/uvvalues.xml", nil)
if err != nil {
return nil, err
}
httpClient := &http.Client{}
resp, err := httpClient.Do(req)
@@ -74,7 +76,7 @@ func parseXML(text io.Reader) (Stations, error) {
dec := xml.NewDecoder(text)
dec.Strict = false
var v Stations;
var v Stations
err := dec.Decode(&v)
return v, err;
return v, err
}