mirror of
https://github.com/openhab/openhab-addons.git
synced 2025-01-10 15:11:59 +01:00
Ignore NuvoNet events for sources not managed by openHAB (#13535)
Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
This commit is contained in:
mlobstein
GitHub
parent
6103c30830
commit
51054fe51b
@ -224,6 +224,13 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
|
||||
return;
|
||||
}
|
||||
|
||||
nuvoNetSrcMap.put("1", config.nuvoNetSrc1);
|
||||
nuvoNetSrcMap.put("2", config.nuvoNetSrc2);
|
||||
nuvoNetSrcMap.put("3", config.nuvoNetSrc3);
|
||||
nuvoNetSrcMap.put("4", config.nuvoNetSrc4);
|
||||
nuvoNetSrcMap.put("5", config.nuvoNetSrc5);
|
||||
nuvoNetSrcMap.put("6", config.nuvoNetSrc6);
|
||||
|
||||
if (this.isMps4) {
|
||||
logger.debug("Port set to {} configuring binding for MPS4 compatability", MPS4_PORT);
|
||||
|
||||
@ -234,13 +241,6 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
|
||||
logger.debug("At least one source is configured as an openHAB NuvoNet source");
|
||||
loadMenuConfiguration(config);
|
||||
|
||||
nuvoNetSrcMap.put("1", config.nuvoNetSrc1);
|
||||
nuvoNetSrcMap.put("2", config.nuvoNetSrc2);
|
||||
nuvoNetSrcMap.put("3", config.nuvoNetSrc3);
|
||||
nuvoNetSrcMap.put("4", config.nuvoNetSrc4);
|
||||
nuvoNetSrcMap.put("5", config.nuvoNetSrc5);
|
||||
nuvoNetSrcMap.put("6", config.nuvoNetSrc6);
|
||||
|
||||
favoriteMap.put("1",
|
||||
!config.favoritesSrc1.isEmpty() ? config.favoritesSrc1.split(COMMA) : new String[0]);
|
||||
favoriteMap.put("2",
|
||||
@ -762,72 +762,78 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
|
||||
}
|
||||
break;
|
||||
case TYPE_MENU_ITEM_SELECTED:
|
||||
String[] updateDataSplit = updateData.split(COMMA);
|
||||
String zoneSource = updateDataSplit[0];
|
||||
String menuId = updateDataSplit[1];
|
||||
int menuItemIdx = Integer.parseInt(updateDataSplit[2]) - 1;
|
||||
// ignore this update unless openHAB is handling this source
|
||||
if (nuvoNetSrcMap.get(key).equals(2)) {
|
||||
String[] updateDataSplit = updateData.split(COMMA);
|
||||
String zoneSource = updateDataSplit[0];
|
||||
String menuId = updateDataSplit[1];
|
||||
int menuItemIdx = Integer.parseInt(updateDataSplit[2]) - 1;
|
||||
|
||||
boolean exitMenu = false;
|
||||
if ("0xFFFFFFFF".equals(menuId)) {
|
||||
TopMenu topMenuItem = nuvoMenus.getSource().get(Integer.parseInt(key) - 1).getTopMenu()
|
||||
.get(menuItemIdx);
|
||||
logger.debug("Top Menu item selected: Source: {} - Menu Item: {}", key, topMenuItem.getText());
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS, topMenuItem.getText());
|
||||
boolean exitMenu = false;
|
||||
if ("0xFFFFFFFF".equals(menuId)) {
|
||||
TopMenu topMenuItem = nuvoMenus.getSource().get(Integer.parseInt(key) - 1).getTopMenu()
|
||||
.get(menuItemIdx);
|
||||
logger.debug("Top Menu item selected: Source: {} - Menu Item: {}", key, topMenuItem.getText());
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS, topMenuItem.getText());
|
||||
|
||||
List<String> subMenuItems = topMenuItem.getItems();
|
||||
List<String> subMenuItems = topMenuItem.getItems();
|
||||
|
||||
if (subMenuItems.isEmpty()) {
|
||||
exitMenu = true;
|
||||
} else {
|
||||
// send submenu (maximum of 20 items)
|
||||
int subMenuSize = subMenuItems.size() < 20 ? subMenuItems.size() : 20;
|
||||
try {
|
||||
connector.sendCommand(zoneSource + "MENU" + (menuItemIdx + 11) + ",0,0," + subMenuSize
|
||||
+ ",0,0," + subMenuSize + ",\"" + topMenuItem.getText() + "\"");
|
||||
Thread.sleep(SLEEP_BETWEEN_CMD_MS);
|
||||
if (subMenuItems.isEmpty()) {
|
||||
exitMenu = true;
|
||||
} else {
|
||||
// send submenu (maximum of 20 items)
|
||||
int subMenuSize = subMenuItems.size() < 20 ? subMenuItems.size() : 20;
|
||||
try {
|
||||
connector.sendCommand(zoneSource + "MENU" + (menuItemIdx + 11) + ",0,0," + subMenuSize
|
||||
+ ",0,0," + subMenuSize + ",\"" + topMenuItem.getText() + "\"");
|
||||
Thread.sleep(SLEEP_BETWEEN_CMD_MS);
|
||||
|
||||
for (int i = 0; i < subMenuSize; i++) {
|
||||
connector.sendCommand(
|
||||
zoneSource + "MENUITEM" + (i + 1) + ",0,0,\"" + subMenuItems.get(i) + "\"");
|
||||
for (int i = 0; i < subMenuSize; i++) {
|
||||
connector.sendCommand(
|
||||
zoneSource + "MENUITEM" + (i + 1) + ",0,0,\"" + subMenuItems.get(i) + "\"");
|
||||
}
|
||||
} catch (NuvoException | InterruptedException e) {
|
||||
logger.debug("Error sending sub menu for {}", zoneSource);
|
||||
}
|
||||
} catch (NuvoException | InterruptedException e) {
|
||||
logger.debug("Error sending sub menu for {}", zoneSource);
|
||||
}
|
||||
} else {
|
||||
// a sub menu item was selected
|
||||
TopMenu topMenuItem = nuvoMenus.getSource().get(Integer.parseInt(key) - 1).getTopMenu()
|
||||
.get(Integer.decode(menuId) - 11);
|
||||
String subMenuItem = topMenuItem.getItems().get(menuItemIdx);
|
||||
|
||||
logger.debug("Sub Menu item selected: Source: {} - Menu Item: {}", key,
|
||||
topMenuItem.getText() + "|" + subMenuItem);
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS,
|
||||
topMenuItem.getText() + "|" + subMenuItem);
|
||||
exitMenu = true;
|
||||
}
|
||||
} else {
|
||||
// a sub menu item was selected
|
||||
TopMenu topMenuItem = nuvoMenus.getSource().get(Integer.parseInt(key) - 1).getTopMenu()
|
||||
.get(Integer.decode(menuId) - 11);
|
||||
String subMenuItem = topMenuItem.getItems().get(menuItemIdx);
|
||||
|
||||
logger.debug("Sub Menu item selected: Source: {} - Menu Item: {}", key,
|
||||
topMenuItem.getText() + "|" + subMenuItem);
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS,
|
||||
topMenuItem.getText() + "|" + subMenuItem);
|
||||
exitMenu = true;
|
||||
}
|
||||
|
||||
if (exitMenu) {
|
||||
try {
|
||||
// tell the zone to exit the menu
|
||||
connector.sendCommand(zoneSource + "MENU0,0,0,0,0,0,0,\"\"");
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending exit menu command for {}", zoneSource);
|
||||
if (exitMenu) {
|
||||
try {
|
||||
// tell the zone to exit the menu
|
||||
connector.sendCommand(zoneSource + "MENU0,0,0,0,0,0,0,\"\"");
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending exit menu command for {}", zoneSource);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case TYPE_ZONE_MENUREQ:
|
||||
logger.debug("Menu Request: Source: {} - Value: {}", key, updateData);
|
||||
// For now we only support one level deep menus. If third field is '1', indicates go back to main menu.
|
||||
String[] menuDataSplit = updateData.split(",");
|
||||
if (menuDataSplit.length > 3 && ONE.equals(menuDataSplit[2])) {
|
||||
try {
|
||||
connector.sendCommand(menuDataSplit[0] + "MENU0xFFFFFFFF,0,0,0,0,0,0,\"\"");
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending main menu command for {}", menuDataSplit[0]);
|
||||
// ignore this update unless openHAB is handling this source
|
||||
if (nuvoNetSrcMap.get(key).equals(2)) {
|
||||
logger.debug("Menu Request: Source: {} - Value: {}", key, updateData);
|
||||
// For now we only support one level deep menus. If third field is '1', indicates go back to main
|
||||
// menu.
|
||||
String[] menuDataSplit = updateData.split(",");
|
||||
if (menuDataSplit.length > 3 && ONE.equals(menuDataSplit[2])) {
|
||||
try {
|
||||
connector.sendCommand(menuDataSplit[0] + "MENU0xFFFFFFFF,0,0,0,0,0,0,\"\"");
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending main menu command for {}", menuDataSplit[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case TYPE_ZONE_CONFIG:
|
||||
logger.debug("Zone Configuration: Zone: {} - Value: {}", key, updateData);
|
||||
@ -845,55 +851,64 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
|
||||
}
|
||||
break;
|
||||
case TYPE_ALBUM_ART_REQ:
|
||||
logger.debug("Album Art Request for Source: {} - Data: {}", key, updateData);
|
||||
// 0x620FD879,80,80,2,0x00C0C0C0,0,0,0,0,1
|
||||
String[] albumArtReq = updateData.split(COMMA);
|
||||
albumArtIds.put(SRC_KEY + key, Integer.decode(albumArtReq[0]));
|
||||
// ignore this update unless openHAB is handling this source
|
||||
if (nuvoNetSrcMap.get(key).equals(2)) {
|
||||
logger.debug("Album Art Request for Source: {} - Data: {}", key, updateData);
|
||||
// 0x620FD879,80,80,2,0x00C0C0C0,0,0,0,0,1
|
||||
String[] albumArtReq = updateData.split(COMMA);
|
||||
albumArtIds.put(SRC_KEY + key, Integer.decode(albumArtReq[0]));
|
||||
|
||||
try {
|
||||
if (albumArtMap.get(SRC_KEY + key).length > 1) {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_AVAILABLE + albumArtIds.get(SRC_KEY + key)
|
||||
+ COMMA + albumArtMap.get(SRC_KEY + key).length);
|
||||
} else {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_AVAILABLE + ZERO_COMMA);
|
||||
try {
|
||||
if (albumArtMap.get(SRC_KEY + key).length > 1) {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_AVAILABLE + albumArtIds.get(SRC_KEY + key)
|
||||
+ COMMA + albumArtMap.get(SRC_KEY + key).length);
|
||||
} else {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_AVAILABLE + ZERO_COMMA);
|
||||
}
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending ALBUMARTAVAILABLE command for source: {}", key);
|
||||
}
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending ALBUMARTAVAILABLE command for source: {}", key);
|
||||
}
|
||||
break;
|
||||
case TYPE_ALBUM_ART_FRAG_REQ:
|
||||
logger.debug("Album Art Fragment Request for Source: {} - Data: {}", key, updateData);
|
||||
// 0x620FD879,0,750 (id, requested offset from start of image, byte length requested)
|
||||
String[] albumArtFragReq = updateData.split(COMMA);
|
||||
int requestedId = Integer.decode(albumArtFragReq[0]);
|
||||
int offset = Integer.parseInt(albumArtFragReq[1]);
|
||||
int length = Integer.parseInt(albumArtFragReq[2]);
|
||||
// ignore this update unless openHAB is handling this source
|
||||
if (nuvoNetSrcMap.get(key).equals(2)) {
|
||||
logger.debug("Album Art Fragment Request for Source: {} - Data: {}", key, updateData);
|
||||
// 0x620FD879,0,750 (id, requested offset from start of image, byte length requested)
|
||||
String[] albumArtFragReq = updateData.split(COMMA);
|
||||
int requestedId = Integer.decode(albumArtFragReq[0]);
|
||||
int offset = Integer.parseInt(albumArtFragReq[1]);
|
||||
int length = Integer.parseInt(albumArtFragReq[2]);
|
||||
|
||||
if (requestedId == albumArtIds.get(SRC_KEY + key)) {
|
||||
byte[] chunk = new byte[length];
|
||||
byte[] albumArtBytes = albumArtMap.get(SRC_KEY + key);
|
||||
if (requestedId == albumArtIds.get(SRC_KEY + key)) {
|
||||
byte[] chunk = new byte[length];
|
||||
byte[] albumArtBytes = albumArtMap.get(SRC_KEY + key);
|
||||
|
||||
if (albumArtBytes != null) {
|
||||
System.arraycopy(albumArtBytes, offset, chunk, 0, length);
|
||||
final String frag = Base64.getEncoder().encodeToString(chunk);
|
||||
try {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_FRAG + requestedId + COMMA + offset + COMMA
|
||||
+ frag.length() + COMMA + frag);
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending ALBUMARTFRAG command for source: {}, artId: {}", key,
|
||||
requestedId);
|
||||
if (albumArtBytes != null) {
|
||||
System.arraycopy(albumArtBytes, offset, chunk, 0, length);
|
||||
final String frag = Base64.getEncoder().encodeToString(chunk);
|
||||
try {
|
||||
connector.sendCommand(SRC_KEY + key + ALBUM_ART_FRAG + requestedId + COMMA + offset
|
||||
+ COMMA + frag.length() + COMMA + frag);
|
||||
} catch (NuvoException e) {
|
||||
logger.debug("Error sending ALBUMARTFRAG command for source: {}, artId: {}", key,
|
||||
requestedId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case TYPE_FAVORITE_REQ:
|
||||
logger.debug("Favorite request for source: {} - favoriteId: {}", key, updateData);
|
||||
try {
|
||||
int playlistIdx = Integer.parseInt(updateData, 16) - 1000;
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS,
|
||||
"PLAY_MUSIC_PRESET:" + favoriteMap.get(key)[playlistIdx]);
|
||||
} catch (NumberFormatException nfe) {
|
||||
logger.debug("Unable to parse favoriteId: {}", updateData);
|
||||
// ignore this update unless openHAB is handling this source
|
||||
if (nuvoNetSrcMap.get(key).equals(2)) {
|
||||
logger.debug("Favorite request for source: {} - favoriteId: {}", key, updateData);
|
||||
try {
|
||||
int playlistIdx = Integer.parseInt(updateData, 16) - 1000;
|
||||
updateChannelState(NuvoEnum.valueOf(SOURCE + key), CHANNEL_BUTTON_PRESS,
|
||||
"PLAY_MUSIC_PRESET:" + favoriteMap.get(key)[playlistIdx]);
|
||||
} catch (NumberFormatException nfe) {
|
||||
logger.debug("Unable to parse favoriteId: {}", updateData);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user