这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on May 17, 2021. It is now read-only.

some changes to XBMC binding #4622

Merged
merged 4 commits into from
Oct 6, 2016
Merged

some changes to XBMC binding #4622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8acbac9
Update openhab_default.cfg
giig1967g Sep 5, 2016
80052fc
Hi,
giig1967g Sep 5, 2016
d426f55
Hi,
giig1967g Sep 18, 2016
79c4fb4
Modified files according to comments.
giig1967g Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions ...enhab.binding.xbmc/src/main/java/org/openhab/binding/xbmc/internal/XbmcActiveBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.Map;

import org.apache.commons.lang.StringUtils;
import org.openhab.binding.xbmc.XbmcBindingProvider;
import org.openhab.binding.xbmc.rpc.XbmcConnector;
import org.openhab.core.binding.AbstractActiveBinding;
Expand All @@ -32,10 +33,10 @@
* All item updates are received asynchronously via the web socket All item
* commands are sent via the web socket
*
* @author tlan, Ben Jones
* @author tlan, Ben Jones, Plebs
* @since 1.5.0
*/
public class XbmcActiveBinding extends AbstractActiveBinding<XbmcBindingProvider>implements ManagedService {
public class XbmcActiveBinding extends AbstractActiveBinding<XbmcBindingProvider> implements ManagedService {

private static final Logger logger = LoggerFactory.getLogger(XbmcActiveBinding.class);

Expand All @@ -46,12 +47,11 @@ public class XbmcActiveBinding extends AbstractActiveBinding<XbmcBindingProvider
* the refresh interval which is used to check for lost connections
* (optional, defaults to 60000ms)
*/
private long refreshInterval = 60000;
private long refreshInterval = 60000L;

@Override
public void activate() {
logger.debug(getName() + " activate()");
setProperlyConfigured(true);
}

@Override
Expand Down Expand Up @@ -310,6 +310,8 @@ protected void internalReceiveCommand(String itemName, Command command) {
connector.playerStop();
} else if (property.equals("Input.ExecuteAction")) {
connector.inputExecuteAction(command.toString());
} else if (property.startsWith("Input.ExecuteAction.")) {
connector.inputExecuteAction(property.substring(20).toLowerCase());
} else if (property.equals("GUI.ShowNotification")) {
connector.showNotification("openHAB", command.toString());
} else if (property.equals("System.Shutdown") && command == OnOffType.OFF) {
Expand All @@ -326,6 +328,8 @@ protected void internalReceiveCommand(String itemName, Command command) {
connector.playerOpenPVR(command.toString(), 2);
} else if (property.equals("PVR.OpenRadio")) {
connector.playerOpenPVR(command.toString(), 1);
} else if (property.equals("Refresh")) {
execute();
Copy link
Contributor

@watou watou Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you certain that it is threadsafe to do this? The execute() method is called at some refreshInterval in another thread, so it may be possible that this method could be run from each thread overlapping. You might consider using a technique like in the HTTP or Ecobee binding, where the execute() method is called based on a short granularity (five seconds, for example), but checks a future timestamp to see if it should do anything. The "Refresh" action would then just expire the future timestamp, so the next scheduled execute happens on average granulary/2 into the future. The execute() method would just set the future timestamp to the current timestamp + refreshInterval. (There are certainly other sound approaches to avoiding thread safety issues.)

}

} catch (Exception e) {
Expand Down Expand Up @@ -388,10 +392,20 @@ public void updated(Dictionary<String, ?> config) throws ConfigurationException
Map<String, XbmcHost> hosts = new HashMap<String, XbmcHost>();

if (config != null) {

String refreshIntervalString = (String) config.get("refreshInterval");
if (StringUtils.isNotBlank(refreshIntervalString)) {
refreshInterval = Long.parseLong(refreshIntervalString);
}

Enumeration<String> keys = config.keys();

while (keys.hasMoreElements()) {
// Ignore "refreshInterval" key
String key = keys.nextElement();
if ("refreshInterval".equals(key)) {
continue;
}

if ("service.pid".equals(key)) {
continue;
Expand Down Expand Up @@ -422,10 +436,10 @@ public void updated(Dictionary<String, ?> config) throws ConfigurationException
if ("password".equals(parts[1])) {
host.setPassword(value);
}

hosts.put(hostname, host);
}

setProperlyConfigured(true);
nameHostMapper = hosts;
registerAllWatches();
}
Expand Down
7 changes: 5 additions & 2 deletions .../binding/org.openhab.binding.xbmc/src/main/java/org/openhab/binding/xbmc/rpc/RpcCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* XBMC JSON RPC API: http://wiki.xbmc.org/?title=JSON-RPC_API
*
* @author tlan, Ben Jones
* @author tlan, Ben Jones, Plebs
* @since 1.5.0
*/
public abstract class RpcCall {
Expand Down Expand Up @@ -131,11 +131,14 @@ private void postRequest(Map<String, Object> request, Runnable completeHandler)
try {
// we fire this request off asynchronously and let the completeHandler
// process any response as necessary (can be null)
ListenableFuture<Response> future = client.preparePost(uri).setBody(writeJson(request))
String resultWrite = writeJson(request);
logger.debug("Write JSON: {}", resultWrite ); // Stefano: logging the JSON request
Copy link
Contributor

@watou watou Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put the code through the Eclipse IDE formatter so future changes don't reformat lines with incorrect formatting.

ListenableFuture<Response> future = client.preparePost(uri).setBody(resultWrite)
.setHeader("content-type", "application/json").setHeader("accept", "application/json")
.execute(new AsyncCompletionHandler<Response>() {
@Override
public Response onCompleted(Response response) throws Exception {
logger.debug("Read JSON: {}", response.getResponseBody()); // Stefano: logging the JSON response
Copy link
Contributor

@watou watou Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put the code through the Eclipse IDE formatter so future changes don't reformat lines with incorrect formatting.

Map<String, Object> json = readJson(response.getResponseBody());

// if we get an error then throw an exception to stop the
Expand Down
134 changes: 101 additions & 33 deletions ...ng/org.openhab.binding.xbmc/src/main/java/org/openhab/binding/xbmc/rpc/XbmcConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.openhab.binding.xbmc.rpc.calls.PVRGetChannels;
import org.openhab.binding.xbmc.rpc.calls.PlayerGetActivePlayers;
import org.openhab.binding.xbmc.rpc.calls.PlayerGetItem;
import org.openhab.binding.xbmc.rpc.calls.PlayerGetLabels;
import org.openhab.binding.xbmc.rpc.calls.PlayerGetProperties;
import org.openhab.binding.xbmc.rpc.calls.PlayerOpen;
import org.openhab.binding.xbmc.rpc.calls.PlayerPlayPause;
import org.openhab.binding.xbmc.rpc.calls.PlayerStop;
Expand Down Expand Up @@ -61,7 +63,7 @@
/**
* Manages the web socket connection for a single XBMC instance.
*
* @author tlan, Ben Jones, Ard van der Leeuw
* @author tlan, Ben Jones, Ard van der Leeuw, Plebs
* @since 1.5.0
*/
public class XbmcConnector {
Expand Down Expand Up @@ -125,7 +127,7 @@ public XbmcConnector(XbmcHost xbmc, EventPublisher eventPublisher) {

/***
* Check if the connection to the XBMC instance is active
*
*
* @return true if an active connection to the XBMC instance exists, false otherwise
*/
public boolean isConnected() {
Expand All @@ -139,7 +141,7 @@ public boolean isConnected() {
/**
* Attempts to create a connection to the XBMC host and begin listening
* for updates over the async http web socket
*
*
* @throws ExecutionException
* @throws InterruptedException
* @throws IOException
Expand Down Expand Up @@ -276,15 +278,16 @@ public void run() {

/**
* Create a mapping between an item and an xbmc property
*
*
* @param itemName
* The name of the item which should receive updates
* @param property
* The property of this xbmc instance, which is to be
* watched for changes
*
*
*/
public void addItem(String itemName, String property) {
logger.debug("Mapping: itemname = {} & property = {}", itemName, property);
Copy link
Contributor

@watou watou Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put the code through the Eclipse IDE formatter so future changes don't reformat lines with incorrect formatting.

if (!watches.containsKey(itemName)) {
watches.put(itemName, property);
}
Expand All @@ -307,7 +310,7 @@ public void updatePlayerStatus() {

/**
* Update the status of the current player
*
*
* @param updatePolledPropertiesOnly
* If updatePolledPropertiesOnly is true, only update the Player properties that need to be polled
* If updatePolledPropertiesOnly is false, update the Player state itself as well
Expand Down Expand Up @@ -543,7 +546,7 @@ public void run() {

/**
* Request an update for the Player properties from XBMC
*
*
* @param playerId
* The id of the currently active player
*/
Expand All @@ -553,7 +556,7 @@ private void requestPlayerUpdate(int playerId) {

/**
* Request an update for the Player properties from XBMC
*
*
* @param playerId
* The id of the currently active player
* @param updatePolledPropertiesOnly
Expand Down Expand Up @@ -581,25 +584,78 @@ private void requestPlayerUpdate(int playerId, boolean updatePolledPropertiesOnl
if (!properties.isEmpty()) {
logger.debug("[{}]: Retrieving properties ({}) for playerId {}", xbmc.getHostname(), properties.size(),
playerId);
// make the request for the player item details
final PlayerGetItem item = new PlayerGetItem(client, httpUri);
item.setPlayerId(playerId);
item.setProperties(properties);

item.execute(new Runnable() {
@Override
public void run() {
// now update each of the openHAB items for each property
for (String property : properties) {
String value = item.getPropertyValue(property);
if (property.equals("Player.Fanart")) {
updateFanartUrl(property, value);
} else {
final List<String> propertiesInfo = new ArrayList<String>();
final List<String> propertiesProperties = new ArrayList<String>();
final List<String> propertiesLabels = new ArrayList<String>();

for (String property : properties) {
if (property.startsWith("Player.")) {
propertiesInfo.add(property);
}
if (property.startsWith("Property.")) {
propertiesProperties.add(property);
}
if (property.startsWith("Label.")) {
propertiesLabels.add(property);
}
}

// make the request for the player item details using GETINFO
if (!propertiesInfo.isEmpty()) {
final PlayerGetItem item = new PlayerGetItem(client, httpUri);
item.setPlayerId(playerId);
item.setProperties(propertiesInfo);

item.execute(new Runnable() {
@Override
public void run() {
// now update each of the openHAB items for each property
for (String property : propertiesInfo) {
String value = item.getPropertyValue(property);
if (property.equals("Player.Fanart")) {
updateFanartUrl(property, value);
} else {
updateProperty(property, value);
}
}
}
});
}

// make the request for the player item2 details using GETPROPERTIES
if (!propertiesProperties.isEmpty()) {
final PlayerGetProperties item2 = new PlayerGetProperties(client, httpUri);
item2.setPlayerId(playerId);
item2.setProperties(propertiesProperties);

item2.execute(new Runnable() {
@Override
public void run() {
// now update each of the openHAB items for each property
for (String property : propertiesProperties) {
String value = item2.getPropertyValue(property);
updateProperty(property, value);
}
}
}
});
});
}

// make the request for the player item3 details using GETLABELS
if (!propertiesLabels.isEmpty()) {
final PlayerGetLabels item3 = new PlayerGetLabels(client, httpUri);
item3.setProperties(propertiesLabels);

item3.execute(new Runnable() {
@Override
public void run() {
// now update each of the openHAB items for each property
for (String property : propertiesLabels) {
String value = item3.getPropertyValue(property);
updateProperty(property, value);
}
}
});
}
}
}

Expand Down Expand Up @@ -652,7 +708,7 @@ private void updateProperty(String property, OnOffType value) {

/**
* get a distinct list of player properties we have items configured for
*
*
* @return
* A list of property names
*/
Expand All @@ -662,7 +718,7 @@ private List<String> getPlayerProperties() {

/**
* get a distinct list of player properties we have items configured for
*
*
* @param updatePolledPropertiesOnly
* Only get the properties that need to be refreshed by polling if true,
* otherwise get all the properties that have items configured for
Expand All @@ -676,25 +732,37 @@ private List<String> getPlayerProperties(boolean updatePolledPropertiesOnly) {
for (String property : watches.values()) {
if (properties.contains(property)) {
continue;
} else if (property.equals("Player.Label")) {
}
if (property.equals("Player.State")) {
continue;
}
if (property.startsWith("Player.")) {
properties.add(property);
} else if (property.equals("Player.Title")) {
}
if (property.startsWith("Property.")) {
properties.add(property);
}
if (property.startsWith("Label.")) {
properties.add(property);
}
}
} else {
for (String property : watches.values()) {
if (!property.startsWith("Player.")) {
if (properties.contains(property)) {
continue;
}
if (property.equals("Player.State")) {
continue;
}
if (properties.contains(property)) {
continue;
if (property.startsWith("Player.")) {
properties.add(property);
}
if (property.startsWith("Property.")) {
properties.add(property);
}
if (property.startsWith("Label.")) {
properties.add(property);
}

properties.add(property);
}
}
return properties;
Expand Down
9 changes: 6 additions & 3 deletions ....openhab.binding.xbmc/src/main/java/org/openhab/binding/xbmc/rpc/calls/PlayerGetItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* Player.GetItem RPC
*
* @author tlan, Ben Jones, Marcel Erkel
* @author tlan, Ben Jones, Marcel Erkel, Plebs
* @since 1.5.0
*/
public class PlayerGetItem extends RpcCall {
Expand Down Expand Up @@ -58,8 +58,11 @@ protected Map<String, Object> getParams() {
if (property.equals("Player.Label")) {
continue;
}
String paramProperty = getParamProperty(property);
paramProperties.add(paramProperty);
if (property.startsWith("Player.")) {
// properties entered as 'Player.Title' etc - so strip the first 7 chars
String paramProperty = getParamProperty(property);
paramProperties.add(paramProperty);
}
}

Map<String, Object> params = new HashMap<String, Object>();
Expand Down
Loading