public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tivo] fix bugs with standby mode and channel parsing (#9964)

Browse Source 
* fix some tivo binding bugs

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>

* update search example rule

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
This commit is contained in:
mlobstein
2021-01-26 09:45:59 -06:00
committed by GitHub
parent 89f5538f25
commit a49b3487fa
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java
View File

@@ -129,15 +129,14 @@ public class TiVoHandler extends BaseThingHandler {
TivoStatusData commandResult = null;
logger.debug("handleCommand '{}' - {} found!", getThing().getUID(), commandKeyword);
// Re-write command keyword if we are in STANDBY, as only IRCODE TIVO will wake the unit from
// standby mode
// standby mode, otherwise just execute the commands
if (deviceStatus.getConnectionStatus() == ConnectionStatus.STANDBY && commandKeyword.contentEquals("TELEPORT")
&& commandParameter.contentEquals("TIVO")) {
String command = "IRCODE " + commandParameter;
logger.debug("TiVo '{}' TELEPORT re-mapped to IRCODE as we are in standby: '{}'", getThing().getUID(),
command);
}
// Execute command
if (commandKeyword.contentEquals("FORCECH") || commandKeyword.contentEquals("SETCH")) {
commandResult = tivoConnection.get().cmdTivoSend(command);
} else if (commandKeyword.contentEquals("FORCECH") || commandKeyword.contentEquals("SETCH")) {
commandResult = chChannelChange(commandKeyword, commandParameter);
} else {
commandResult = tivoConnection.get().cmdTivoSend(commandKeyword + " " + commandParameter);

12
bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/service/TivoStatusProvider.java
View File

@@ -141,8 +141,12 @@ public class TivoStatusProvider {
logger.debug(" statusParse '{}' - running on string '{}'", tivoConfigData.getCfgIdentifier(), rawStatus);
if (rawStatus.contentEquals("COMMAND_TIMEOUT")) {
// Ignore COMMAND_TIMEOUT, they occur a few seconds after each successful command, just return existing
// status again
// If connection status was UNKNOWN, COMMAND_TIMEOUT indicates the Tivo is alive, so update the status
if (this.tivoStatusData.getConnectionStatus() == ConnectionStatus.UNKNOWN) {
return new TivoStatusData(false, -1, -1, false, "COMMAND_TIMEOUT", false, ConnectionStatus.ONLINE);
}
// Otherwise ignore COMMAND_TIMEOUT, they occur a few seconds after each successful command, just return
// existing status again
return this.tivoStatusData;
} else {
switch (rawStatus) {
@@ -181,7 +185,7 @@ public class TivoStatusProvider {
chNum = Integer.parseInt(matcher.group(1).trim());
logger.debug(" statusParse '{}' - parsed channel '{}'", tivoConfigData.getCfgIdentifier(), chNum);
}
if (matcher.groupCount() == 2) {
if (matcher.groupCount() == 2 && matcher.group(2) != null) {
subChNum = Integer.parseInt(matcher.group(2).trim());
logger.debug(" statusParse '{}' - parsed sub-channel '{}'", tivoConfigData.getCfgIdentifier(),
subChNum);
@@ -252,6 +256,8 @@ public class TivoStatusProvider {
tivoConfigData.getCfgIdentifier());
StreamReader streamReader = this.streamReader;
if (streamReader != null && streamReader.isAlive()) {
// Send a newline to poke the Tivo to verify it responds with INVALID_COMMAND/COMMAND_TIMEOUT
streamWriter.println("\r");
return true;
}
} else {