gmgauthier/gostations
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package updates

Browse Source
This commit is contained in:
Greg Gauthier 2023-12-13 12:00:28 +00:00
parent d0a8fdfb11
commit c2508127b4
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
browser.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"log" "log"
"math/rand" "math/rand"
"net" "net"
@ -22,7 +23,7 @@ type stationRecord struct {
} }
func RandomIP(iplist []net.IP) net.IP { func RandomIP(iplist []net.IP) net.IP {
rand.Seed(time.Now().Unix()) rand.NewSource(time.Now().Unix())
randomIndex := rand.Intn(len(iplist)) randomIndex := rand.Intn(len(iplist))
return iplist[randomIndex] return iplist[randomIndex]
} }
@ -44,13 +45,18 @@ func GetApiHost() string {
return apiHost return apiHost
} }
func GetStations(qstring string) ([]stationRecord, error){ func GetStations(qstring string) ([]stationRecord, error) {
urlstr := fmt.Sprintf("https://%s/json/stations/search?%s&limit=%d",GetApiHost(),qstring,maxitems()) urlstr := fmt.Sprintf("https://%s/json/stations/search?%s&limit=%d", GetApiHost(), qstring, maxitems())
resp, err := http.Get(urlstr) resp, err := http.Get(urlstr)
if err != nil { if err != nil {
log.Print(err.Error()) log.Print(err.Error())
} }
defer resp.Body.Close() defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
log.Print(err.Error())
}
}(resp.Body)
var data []stationRecord var data []stationRecord
err = json.NewDecoder(resp.Body).Decode(&data) err = json.NewDecoder(resp.Body).Decode(&data)
@ -72,28 +78,26 @@ func pruneStations(stations []stationRecord) []stationRecord {
func StationSearch(name string, country string, state string, tags string, notok bool) ([]stationRecord, error) { func StationSearch(name string, country string, state string, tags string, notok bool) ([]stationRecord, error) {
params := url.Values{} params := url.Values{}
if name != ""{ if name != "" {
params.Add("name", name) params.Add("name", name)
} }
if country != "" { if country != "" {
params.Add("country", country) params.Add("country", country)
} }
if state != ""{ if state != "" {
params.Add("state", state) params.Add("state", state)
} }
if tags != ""{ if tags != "" {
params.Add("tag",tags) params.Add("tag", tags)
} }
stations, err := GetStations(params.Encode()) stations, err := GetStations(params.Encode())
if err != nil{ if err != nil {
return nil, err return nil, err
} }
if notok{ if notok {
return stations, err return stations, err
} // otherwise prune the list } // otherwise prune the list
prunedStations := pruneStations(stations) // eliminate stations that are reporting down. prunedStations := pruneStations(stations) // eliminate stations that are reporting down.
return prunedStations, err return prunedStations, err
} }