use telnet also for sending commands

splattner · Oct 31, 2023 · c40295d · c40295d
1 parent 72383cf
commit c40295d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/pkg/denonavr/commands.go b/pkg/denonavr/commands.go
@@ -8,7 +8,20 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func (d *DenonAVR) sendCommandToDevice(denonCommandType DenonCommand, command string) (int, error) {
+func (d *DenonAVR) sendCommandToDevice(cmd DenonCommand, payload string) (int, error) {
+
+	if d.telnetEnabled {
+
+		err := d.sendTelnetCommand(cmd, payload)
+		if err != nil {
+			return 404, err
+		}
+	}
+
+	return d.sendHTTPCommand(cmd, payload)
+}
+
+func (d *DenonAVR) sendHTTPCommand(denonCommandType DenonCommand, command string) (int, error) {
 
 	url := "http://" + d.Host + COMMAND_URL + "?" + url.QueryEscape(string(denonCommandType)+command)
 	log.WithFields(log.Fields{
@@ -21,7 +34,7 @@ func (d *DenonAVR) sendCommandToDevice(denonCommandType DenonCommand, command st
 		return req.StatusCode, fmt.Errorf("error sending command: %w", err)
 	}
 
-	// Trigger a updata data, handled in the Listen Loop
+	// Trigger a update to get updated data handled in the Listen Loop
 	d.updateTrigger <- "update"
 
 	return req.StatusCode, nil

diff --git a/pkg/denonavr/telnet.go b/pkg/denonavr/telnet.go
@@ -110,16 +110,18 @@ func (d *DenonAVR) listenTelnet() {
 	}
 }
 
-// func (d *DenonAVR) sendTelnetCommand(cmd DenonCommand, payload string) {
+func (d *DenonAVR) sendTelnetCommand(cmd DenonCommand, payload string) error {
 
-// 	d.telnetMutex.Lock()
+	d.telnetMutex.Lock()
 
-// 	defer d.telnetMutex.Unlock()
+	defer d.telnetMutex.Unlock()
 
-// 	log.WithFields(log.Fields{
-// 		"cmd":     string(cmd),
-// 		"payload": payload,
-// 	}).Debug("send telnet command")
+	log.WithFields(log.Fields{
+		"cmd":     string(cmd),
+		"payload": payload,
+	}).Debug("send telnet command")
 
-// 	d.telnet.Write([]byte(string(cmd) + payload + "\r"))
-// }
+	_, err := d.telnet.Write([]byte(string(cmd) + payload + "\r"))
+
+	return err
+}