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 25s
Details

Browse Source
This commit is contained in:
Alex Savin
2025-06-03 12:51:55 -04:00
parent c2128f278e
commit c3820ce0af
4 changed files with 87 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vehicle.go
View File

@ -458,10 +458,10 @@ func (v *Vehicle) GetClimatePresets() {
if len(cProfiles) > 0 {
for _, cp := range cProfiles {
if v.isEV() && cp.VehicleType == "phev" {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
} else {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
} else {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
@ -469,10 +469,10 @@ func (v *Vehicle) GetClimatePresets() {
}
}
if !v.isEV() && cp.VehicleType == "gas" {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
} else {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
} else {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
@ -481,7 +481,7 @@ func (v *Vehicle) GetClimatePresets() {
}
}
} else {
v.client.logger.Debug("didn't find any climate quick presets")
v.client.logger.Debug("didn't find any climate presets")
}
v.Updated = time.Now()
} else {
@ -509,16 +509,16 @@ func (v *Vehicle) GetClimateQuickPresets() {
re2 := regexp.MustCompile(`\\`)
result = re2.ReplaceAllString(result, `"`) // \u0022
var cProfile ClimateProfile
err = json.Unmarshal([]byte(result), &cProfile)
var cp ClimateProfile
err = json.Unmarshal([]byte(result), &cp)
if err != nil {
v.client.logger.Error("error while parsing climate quick presets json", "request", "GetClimateQuickPresets", "error", err.Error())
}
if _, ok := v.ClimateProfiles[cProfile.PresetType+cProfile.Name]; ok {
v.ClimateProfiles[cProfile.PresetType+cProfile.Name] = cProfile
if _, ok := v.ClimateProfiles["quick"+cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles["quick"+cp.PresetType+strings.TrimSpace(cp.Name)] = cp
} else {
v.ClimateProfiles[cProfile.PresetType+cProfile.Name] = cProfile
v.ClimateProfiles["quick"+cp.PresetType+strings.TrimSpace(cp.Name)] = cp
}
v.Updated = time.Now()
} else {
@ -552,13 +552,13 @@ func (v *Vehicle) GetClimateUserPresets() {
if len(cProfiles) > 0 {
for _, cp := range cProfiles {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)] = cp
} else {
if _, ok := v.ClimateProfiles[cp.PresetType+cp.Name]; ok {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
if _, ok := v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)]; ok {
v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)] = cp
} else {
v.ClimateProfiles[cp.PresetType+cp.Name] = cp
v.ClimateProfiles[cp.PresetType+strings.TrimSpace(cp.Name)] = cp
}
}
}