Merge pull request #52 from splattner/denon_improvements_part2

fix inputfuncsourcelist
splattner · Oct 30, 2023 · eeec944 · eeec944
2 parents b79948d + f0c9cc0
commit eeec944
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/pkg/denonavr/attributes.go b/pkg/denonavr/attributes.go
@@ -5,7 +5,7 @@ import "reflect"
 // Set an attribute and call entity Change function if changed
 func (d *DenonAVR) SetAttribute(name string, value interface{}) {
 
-	changed := d.attributes[name] != nil && !reflect.DeepEqual(d.attributes[name], value)
+	changed := d.attributes[name] == nil || !reflect.DeepEqual(d.attributes[name], value)
 
 	d.attributes[name] = value
 

diff --git a/pkg/denonavr/denonavr.go b/pkg/denonavr/denonavr.go
@@ -3,6 +3,7 @@ package denonavr
 import (
 	"encoding/xml"
 	"io"
+	"sort"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -201,12 +202,15 @@ func (d *DenonAVR) updateZoneStatusAndNotify(zone DenonZone) {
 	d.SetAttribute(zoneName+"SurroundMode", zoneStatus.SurrMode)
 
 	// We use the renamed input sources
-	var sourceList []string
 	inputFuncSelectList := d.GetZoneInputFuncList(zone)
+	// map[string]string are unorderen and range gives a different result on each run
+	inputList := make([]string, 0, len(inputFuncSelectList))
 	for _, renamedSource := range inputFuncSelectList {
-		sourceList = append(sourceList, renamedSource)
+		inputList = append(inputList, renamedSource)
 	}
-	d.SetAttribute(zoneName+"InputFuncList", sourceList)
+	// sort the slice by keys
+	sort.Strings(inputList)
+	d.SetAttribute(zoneName+"InputFuncList", inputList)
 
 	inputFuncSelect := zoneStatus.InputFuncSelect
 	// Rename Source with the SOURCE_MAPPING if necessary

diff --git a/pkg/denonavr/source.go b/pkg/denonavr/source.go
@@ -103,30 +103,14 @@ var PLAYING_SOURCES = append(append(append(NETAUDIO_SOURCES, NETAUDIO_SOURCES...
 
 func (d *DenonAVR) GetZoneInputFuncList(zone DenonZone) map[string]string {
 
-	var inputFuncList map[string]string
-
-	switch zone {
-	case MainZone:
-		inputFuncList = d.getInputFuncList(d.zoneStatus[MainZone])
-	case Zone2:
-		inputFuncList = d.getInputFuncList(d.zoneStatus[Zone2])
-	case Zone3:
-		inputFuncList = d.getInputFuncList(d.zoneStatus[Zone3])
-	}
-
-	return inputFuncList
-}
-
-func (d *DenonAVR) getInputFuncList(zoneStatus DenonZoneStatus) map[string]string {
-
 	inputFuncList := make(map[string]string)
 
 	// Only add those not deleted
 	// Use renamed value
-	for i, input := range zoneStatus.InputFuncList {
+	for i, input := range d.zoneStatus[zone].InputFuncList {
 		// only the ones active or empty (== Online Music)
-		if zoneStatus.SourceDelete[i] == "USE" || zoneStatus.SourceDelete[i] == "" {
-			inputFuncList[input] = strings.TrimRight(zoneStatus.RenameSource[i], " ")
+		if d.zoneStatus[zone].SourceDelete[i] == "USE" || d.zoneStatus[zone].SourceDelete[i] == "" {
+			inputFuncList[input] = strings.TrimRight(d.zoneStatus[zone].RenameSource[i], " ")
 		}
 	}