xevion/go-ha
1
0
Fork 0
mirror of https://github.com/Xevion/go-ha.git synced 2025-12-07 05:15:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in State.getLatLong()

Browse Source
This commit is contained in:
Lubos Dolezel
2023-05-24 17:23:50 +02:00
parent 1dd8eaa58d
commit ff9f6cb95e
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.go
View File

@@ -98,7 +98,10 @@ func NewApp(request NewAppRequest) (*App, error) {
wsWriter := &ws.WebsocketWriter{Conn: conn} wsWriter := &ws.WebsocketWriter{Conn: conn}
service := newService(wsWriter, ctx, httpClient) service := newService(wsWriter, ctx, httpClient)
state := newState(httpClient, request.HomeZoneEntityId) state, err := newState(httpClient, request.HomeZoneEntityId)
if err != nil {
return nil, err
}
return &App{ return &App{
conn: conn, conn: conn,

32
state.go
View File

@@ -2,7 +2,8 @@ package gomeassistant
import ( import (
"encoding/json" "encoding/json"
"log" "errors"
"fmt"
"time" "time"
"github.com/golang-module/carbon" "github.com/golang-module/carbon"
@@ -23,19 +24,34 @@ type EntityState struct {
LastChanged time.Time `json:"last_changed"` LastChanged time.Time `json:"last_changed"`
} }
func newState(c *http.HttpClient, homeZoneEntityId string) *State { func newState(c *http.HttpClient, homeZoneEntityId string) (*State, error) {
state := &State{httpClient: c} state := &State{httpClient: c}
state.getLatLong(c, homeZoneEntityId) err := state.getLatLong(c, homeZoneEntityId)
return state if err != nil {
return nil, err
}
return state, nil
} }
func (s *State) getLatLong(c *http.HttpClient, homeZoneEntityId string) { func (s *State) getLatLong(c *http.HttpClient, homeZoneEntityId string) error {
resp, err := s.Get(homeZoneEntityId) resp, err := s.Get(homeZoneEntityId)
if err != nil { if err != nil {
log.Fatalf("Couldn't get latitude/longitude from home assistant entity '%s'. Did you type it correctly? It should be a zone like 'zone.home'.\n", homeZoneEntityId) return errors.New(fmt.Sprintf("couldn't get latitude/longitude from home assistant entity '%s'. Did you type it correctly? It should be a zone like 'zone.home'.\n", homeZoneEntityId))
} }
s.latitude = resp.Attributes["latitude"].(float64)
s.longitude = resp.Attributes["longitude"].(float64) if resp.Attributes["latitude"] != nil {
s.latitude = resp.Attributes["latitude"].(float64)
} else {
return errors.New("server returned nil latitude")
}
if resp.Attributes["longitude"] != nil {
s.longitude = resp.Attributes["longitude"].(float64)
} else {
return errors.New("server returned nil longitude")
}
return nil
} }
func (s *State) Get(entityId string) (EntityState, error) { func (s *State) Get(entityId string) (EntityState, error) {