VW ID/ Audi etron: fix handling of partial errors

vehicle/vw/id/api.go

@@ -1,7 +1,6 @@
 package id
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -73,16 +72,15 @@ func (v *API) Vehicles() (res []string, err error) {
 	return res, err
 }
 
-// Status implements the /status response
+// Status implements the /status response.
+// It is callers responsibility to check for embedded (partial) errors.
 func (v *API) Status(vin string) (res Status, err error) {
 	uri := fmt.Sprintf("%s/vehicles/%s/status", BaseURL, vin)
 
 	req, err := request.New(http.MethodGet, uri, nil, request.AcceptJSON)
 
 	if err == nil {
-		if err = v.DoJSON(req, &res); err == nil && len(res.Error) > 0 {
-			err = errors.New("unknown error")
-		}
+		err = v.DoJSON(req, &res)
 	}
 
 	return res, err

vehicle/vw/id/provider.go

@@ -32,6 +32,10 @@ var _ api.Battery = (*Provider)(nil)
 // SoC implements the api.Vehicle interface
 func (v *Provider) SoC() (float64, error) {
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("batteryStatus")
+	}
+
 	if err == nil {
 		return float64(res.Data.BatteryStatus.CurrentSOCPercent), nil
 	}
@@ -46,6 +50,10 @@ func (v *Provider) Status() (api.ChargeStatus, error) {
 	status := api.StatusA // disconnected
 
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("chargingStatus")
+	}
+
 	if err == nil {
 		if res.Data.PlugStatus.PlugConnectionState == "connected" {
 			status = api.StatusB
@@ -63,6 +71,10 @@ var _ api.VehicleFinishTimer = (*Provider)(nil)
 // FinishTime implements the api.VehicleFinishTimer interface
 func (v *Provider) FinishTime() (time.Time, error) {
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("chargingStatus")
+	}
+
 	if err == nil {
 		cst := res.Data.ChargingStatus
 		return cst.CarCapturedTimestamp.Add(time.Duration(cst.RemainingChargingTimeToCompleteMin) * time.Minute), err
@@ -76,6 +88,10 @@ var _ api.VehicleRange = (*Provider)(nil)
 // Range implements the api.VehicleRange interface
 func (v *Provider) Range() (int64, error) {
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("batteryStatus")
+	}
+
 	if err == nil {
 		return int64(res.Data.BatteryStatus.CruisingRangeElectricKm), nil
 	}
@@ -88,6 +104,10 @@ var _ api.VehicleOdometer = (*Provider)(nil)
 // Odometer implements the api.VehicleOdometer interface
 func (v *Provider) Odometer() (float64, error) {
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("maintenanceStatus")
+	}
+
 	if err == nil {
 		if res.Data.MaintenanceStatus == nil {
 			return 0, api.ErrNotAvailable
@@ -103,6 +123,10 @@ var _ api.VehicleClimater = (*Provider)(nil)
 // Climater implements the api.VehicleClimater interface
 func (v *Provider) Climater() (active bool, outsideTemp, targetTemp float64, err error) {
 	res, err := v.statusG()
+	if err == nil {
+		err = res.Error.Extract("climatisationStatus")
+	}
+
 	if err == nil {
 		state := strings.ToLower(res.Data.ClimatisationStatus.ClimatisationState)
 

vehicle/vw/id/types.go

@@ -1,6 +1,7 @@
 package id
 
 import (
+	"fmt"
 	"strings"
 	"time"
 )
@@ -17,7 +18,19 @@ type Status struct {
 		ClimatisationStatus   `json:"climatisationStatus"` // may be temporarily not available
 		*MaintenanceStatus    `json:"maintenanceStatus"`   // optional
 	}
-	Error map[string]Error
+	Error ErrorMap
+}
+
+type ErrorMap map[string]Error
+
+func (e ErrorMap) Extract(key string) error {
+	for k, v := range e {
+		if k == key {
+			return fmt.Errorf("%s: %s", v.Info, v.Message)
+		}
+	}
+
+	return nil
 }
 
 // Error is the error status