From ceb3e4d99485c7122820b9e89ebd3a34cbc5c1e7 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Wed, 5 Apr 2023 19:09:41 +0200
Subject: [PATCH] Vehicles: show title for unavailable vehicles (#7239)

---
 cmd/config.go              |  2 +-
 vehicle/wrapper/wrapper.go | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/cmd/config.go b/cmd/config.go
index d2a4d1a8f..0e3e833a1 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -268,7 +268,7 @@ func (cp *ConfigProvider) configureVehicles(conf config) error {
 
 				// wrap non-config vehicle errors to prevent fatals
 				log.ERROR.Printf("creating vehicle %s failed: %v", cc.Name, err)
-				v = wrapper.New(err)
+				v = wrapper.New(cc.Name, cc.Other, err)
 			}
 
 			// ensure vehicle config has title
diff --git a/vehicle/wrapper/wrapper.go b/vehicle/wrapper/wrapper.go
index b6608190f..f303668f9 100644
--- a/vehicle/wrapper/wrapper.go
+++ b/vehicle/wrapper/wrapper.go
@@ -2,22 +2,46 @@ package wrapper
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/util"
 )
 
 // Wrapper wraps an api.Vehicle to capture initialization errors
 type Wrapper struct {
 	err       error
 	title     string
+	icon      string
+	phases    int
+	capacity  float64
 	Features_ []api.Feature
 }
 
 // New creates a new Vehicle
-func New(err error) api.Vehicle {
+func New(name string, other map[string]interface{}, err error) api.Vehicle {
+	var cc struct {
+		Title    string
+		Icon     string
+		Phases   int
+		Capacity float64
+		Other    map[string]interface{} `mapstructure:",remain"`
+	}
+
+	// try to decode vehicle-specific config and look for title attribute
+	_ = util.DecodeOther(other, &cc)
+
+	if cc.Title == "" {
+		//lint:ignore SA1019 as Title is safe on ascii
+		cc.Title = strings.Title(name)
+	}
+
 	v := &Wrapper{
 		err:       fmt.Errorf("vehicle not available: %w", err),
-		title:     "unavailable",
+		title:     fmt.Sprintf("%s (offline)", cc.Title),
+		icon:      cc.Icon,
+		phases:    cc.Phases,
+		capacity:  cc.Capacity,
 		Features_: []api.Feature{api.Offline},
 	}
 
@@ -38,17 +62,17 @@ func (v *Wrapper) SetTitle(title string) {
 
 // Icon implements the api.Vehicle interface
 func (v *Wrapper) Icon() string {
-	return ""
+	return v.icon
 }
 
 // Capacity implements the api.Vehicle interface
 func (v *Wrapper) Capacity() float64 {
-	return 0
+	return v.capacity
 }
 
 // Phases implements the api.Vehicle interface
 func (v *Wrapper) Phases() int {
-	return 0
+	return v.phases
 }
 
 // Identifiers implements the api.Vehicle interface