Freifunk-Troisdorf/ubnt-freifunk-map-api
5
0
Fork 0
Code Issues 1 Pull Requests Packages Releases 23 Wiki Activity

Added Config file #10

Merged
stefan merged 7 commits from config-file into master 2021-02-11 19:58:29 +00:00
Conversation 2 Commits 7 Files Changed 4 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1bb128291 - Show all commits

10
main.go
View File

@ -68,7 +68,7 @@ func processUcAPIs(c Config) ([]node, []link) {
//get list of Unifi devices to display
var nodes []node
var links []link
d, err := getDevices(c, "ucDevices.json")
d, err := getDevices(c.Unifi.UCDevicesURL)
if err != nil {
log.Fatalln(err)
}
@ -153,7 +153,7 @@ func processUNMSAPI(c Config) ([]node, []link) {
var links []link
var nodes []node
d, err := getDevices(c, "devices.json")
d, err := getDevices(c.Unms.DevicesURL)
if err != nil {
log.Fatalln(err)
}
@ -279,9 +279,9 @@ func getFile(url string) []byte {
return byteValue
}
func getDevices(c Config, file string) (devices, error) {
func getDevices(url string) (devices, error) {
// get devices from JSON file
jsonFile := getFile(c.Unms.DevicesURL + file)
jsonFile := getFile(url)
// read file to bytes
// variable for d
@ -289,7 +289,7 @@ func getDevices(c Config, file string) (devices, error) {
// unmarshal to struct
err := json.Unmarshal(jsonFile, &d)
if err != nil {
fmt.Println("can´t get devices file from " + c.Unms.DevicesURL)
fmt.Println("can´t get devices file from " + url)
log.Fatal(err)
}
return d, nil