Parse errors in get methods as well

Jacalz · Dec 11, 2024 · 64a40e4 · 64a40e4
1 parent 205fe48
commit 64a40e4
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 13 deletions.
diff --git a/remote/errors.go b/remote/errors.go
@@ -20,6 +20,10 @@ func (c *Control) parseErrorResponse() error {
 		return err
 	}
 
+	return parseErrorFromBuffer(buf[:])
+}
+
+func parseErrorFromBuffer(buf []byte) error {
 	if buf[1] != 'e' {
 		return nil
 	}

diff --git a/remote/power.go b/remote/power.go
@@ -42,5 +42,10 @@ func (c *Control) GetPower() (bool, error) {
 		return false, err
 	}
 
+	err = parseErrorFromBuffer(buf[:])
+	if err != nil {
+		return false, err
+	}
+
 	return buf[3] == '1', nil
 }
diff --git a/remote/reset.go b/remote/reset.go
@@ -34,18 +34,23 @@ func (c *Control) GetResetDelay() (uint8, bool, error) {
 		return 0, false, err
 	}
 
-	resp := [7]byte{}
-	n, err := c.conn.Read(resp[:])
+	buf := [7]byte{}
+	n, err := c.conn.Read(buf[:])
+	if err != nil {
+		return 0, false, err
+	}
+
+	err = parseErrorFromBuffer(buf[:])
 	if err != nil {
 		return 0, false, err
 	}
 
 	// Check if reset is stopped or not enabled.
-	if n >= 4 && resp[3] == '~' {
+	if n >= 4 && buf[3] == '~' {
 		return 0, true, nil
 	}
 
-	number := resp[3 : n-1]
+	number := buf[3 : n-1]
 	delay, err := strconv.ParseUint(string(number), 10, 8)
 	return uint8(delay), false, err
 }
diff --git a/remote/source.go b/remote/source.go
@@ -56,13 +56,18 @@ func (c *Control) GetSourceNumber() (uint, error) {
 		return 0, err
 	}
 
-	resp := [6]byte{}
-	n, err := c.conn.Read(resp[:])
+	buf := [6]byte{}
+	n, err := c.conn.Read(buf[:])
 	if err != nil {
 		return 0, err
 	}
 
-	input := resp[3 : n-1]
+	err = parseErrorFromBuffer(buf[:])
+	if err != nil {
+		return 0, err
+	}
+
+	input := buf[3 : n-1]
 	number, err := strconv.ParseUint(string(input), 10, 8)
 	if err != nil {
 		return 0, err

diff --git a/remote/volume.go b/remote/volume.go
@@ -50,13 +50,18 @@ func (c *Control) GetVolume() (uint, error) {
 		return 0, err
 	}
 
-	resp := [7]byte{}
-	n, err := c.conn.Read(resp[:])
+	buf := [7]byte{}
+	n, err := c.conn.Read(buf[:])
 	if err != nil {
 		return 0, err
 	}
 
-	volume := resp[3 : n-1]
+	err = parseErrorFromBuffer(buf[:])
+	if err != nil {
+		return 0, err
+	}
+
+	volume := buf[3 : n-1]
 	percentage, err := strconv.ParseUint(string(volume), 10, 8)
 	return uint(percentage), err
 }
@@ -83,11 +88,16 @@ func (c *Control) GetVolumeMute() (bool, error) {
 		return false, err
 	}
 
-	resp := [5]byte{}
-	_, err = c.conn.Read(resp[:])
+	buf := [5]byte{}
+	_, err = c.conn.Read(buf[:])
+	if err != nil {
+		return false, err
+	}
+
+	err = parseErrorFromBuffer(buf[:])
 	if err != nil {
 		return false, err
 	}
 
-	return resp[3] == '1', err
+	return buf[3] == '1', err
 }