alex/mysubaru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes
All checks were successful
Golan Testing / testing (1.24.x, ubuntu-latest) (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Alex Savin
2025-05-31 21:15:04 -04:00
parent d66d529fa9
commit 2542993b9f
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client.go
View File

@ -275,16 +275,26 @@ func (c *Client) SelectVehicle(vin string) VehicleData {
"_": timestamp()}
reqURL := MOBILE_API_VERSION + apiURLs["API_SELECT_VEHICLE"]
resp := c.execute(reqURL, GET, params, "", false)
c.logger.Debug("http request output", "request", "SelectVehicle", "body", resp)
var vData VehicleData
respParsed, err := gabs.ParseJSON([]byte(resp))
var r Response
err := json.Unmarshal(resp, &r)
if err != nil {
panic(err)
c.logger.Error("error while parsing json", "request", "SelectVehicle", "error", err.Error())
}
c.logger.Debug("http request output", "request", "SelectVehicle", "body", respParsed)
vdString := respParsed.Path("data").String()
json.Unmarshal([]byte(vdString), &vData)
if r.Success {
var vd VehicleData
err = json.Unmarshal(r.Data, &vd)
if err != nil {
c.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error())
}
c.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
return vd
} else {
return VehicleData{}
}
// resp := c.execute(reqURL, GET, params, "", false)
// logger.Debugf("SELECT VEHICLE OUTPUT >> %v\n", string([]byte(resp)))
@ -309,7 +319,6 @@ func (c *Client) SelectVehicle(vin string) VehicleData {
// # Something else is probably wrong with the backend server context - try resetting
// self.reset_session()
// raise SubaruException("Failed to switch vehicle %s - resetting session." % js_resp.get("errorCode"))
return vData
}
// GetVehicles .
@ -321,8 +330,9 @@ func (c *Client) GetVehicles() []*Vehicle {
"_": timestamp()}
reqURL := MOBILE_API_VERSION + apiURLs["API_SELECT_VEHICLE"]
resp := c.execute(reqURL, GET, params, "", false)
c.logger.Debug("http request output", "request", "GetVehicles", "body", resp)
respParsed, err := gabs.ParseJSON([]byte(resp))
respParsed, err := gabs.ParseJSON(resp)
if err != nil {
c.logger.Error("error while parsing json", "request", "GetVehicles", "error", err.Error())
}
@ -333,9 +343,6 @@ func (c *Client) GetVehicles() []*Vehicle {
json.Unmarshal([]byte(vdString), &vData)
// fmt.Printf("VEHICLE STRING: %+v\n\n", vdString)
// fmt.Printf("VEHICLE DATA: %+v\n\n", vData)
vehicle := &Vehicle{
Vin: vin,
CarName: vData.VehicleName,