mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-21 17:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added config override for server port. Updated Readme. Continued

Browse Source 
enhancements to pass color to a real hue.
This commit is contained in:
Admin
2016-04-14 17:12:06 -05:00
parent 6c2a34f507
commit 50c9369d71
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bwssystems/HABridge/BridgeSettings.java
View File

@@ -47,7 +47,7 @@ public class BridgeSettings extends BackupHandler {
if(Files.exists(filePath) && Files.isReadable(filePath))
configFileProperty = Configuration.CONFIG_FILE;
}
String serverPortOverride = System.getProperty("server.port");
if(configFileProperty != null)
{
log.info("reading from config file: " + configFileProperty);
@@ -154,6 +154,8 @@ public class BridgeSettings extends BackupHandler {
theBridgeSettings.setVeraconfigured(theBridgeSettings.isValidVera());
theBridgeSettings.setHarmonyconfigured(theBridgeSettings.isValidHarmony());
theBridgeSettings.setNestConfigured(theBridgeSettings.isValidNest());
if(serverPortOverride != null)
theBridgeSettings.setServerPort(serverPortOverride);
setupParams(Paths.get(theBridgeSettings.getConfigfile()), ".cfgbk", "habridge.config-");
}

24
src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
View File

@@ -22,6 +22,8 @@ public class BridgeSettingsDescriptor {
private boolean farenheit;
private String configfile;
private Integer numberoflogmessages;
private IpList hueaddress;
private boolean hueconfigured;
public BridgeSettingsDescriptor() {
super();
@@ -30,6 +32,7 @@ public class BridgeSettingsDescriptor {
this.nestconfigured = false;
this.veraconfigured = false;
this.harmonyconfigured = false;
this.hueconfigured = false;
this.farenheit = true;
}
public String getUpnpConfigAddress() {
@@ -152,6 +155,18 @@ public class BridgeSettingsDescriptor {
public void setFarenheit(boolean farenheit) {
this.farenheit = farenheit;
}
public IpList getHueaddress() {
return hueaddress;
}
public void setHueaddress(IpList hueaddress) {
this.hueaddress = hueaddress;
}
public boolean isHueconfigured() {
return hueconfigured;
}
public void setHueconfigured(boolean hueconfigured) {
this.hueconfigured = hueconfigured;
}
public Boolean isValidVera() {
if(this.getVeraAddress() == null || this.getVeraAddress().getDevices().size() <= 0)
return false;
@@ -179,5 +194,12 @@ public class BridgeSettingsDescriptor {
return false;
return true;
}
public Boolean isValidHue() {
if(this.getHueaddress() == null || this.getHueaddress().getDevices().size() <= 0)
return false;
List<NamedIP> devicesList = this.getHueaddress().getDevices();
if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
return false;
return true;
}
}