0.5.4

nicoduj · Mar 17, 2019 · 5048a4e · 5048a4e
1 parent 92d8f70
commit 5048a4e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.5.4
+
+- [BUG] - Devices are not published if publishDevicesAsIndividualAccessories is set to false #106
+
 ## 0.5.3
 
 - [NEW] handle skipedIfSameStateActivities for POWER OFF in TV mode #104 - Just add "PowerOff" to the skipedIfSameStateActivities.

diff --git a/harmonyAsSwitches.js b/harmonyAsSwitches.js
@@ -15,7 +15,7 @@ function HarmonyPlatformAsSwitches(log, config, api) {
   this.harmonyBase.configCommonProperties(log, config, api, this);
 
   this.showTurnOffActivity = config['showTurnOffActivity'];
-  this.publishActivitiesAsIndividualAccessories = HarmonyTools.checkParemeter(
+  this.publishActivitiesAsIndividualAccessories = HarmonyTools.checkParameter(
     config['publishActivitiesAsIndividualAccessories'],
     true
   );
@@ -44,22 +44,6 @@ HarmonyPlatformAsSwitches.prototype = {
     this._foundAccessories.push(myHarmonyAccessory);
   },
 
-  readOptionnalAccessories: function(data) {
-    if (
-      this.devicesToPublishAsAccessoriesSwitch &&
-      this.devicesToPublishAsAccessoriesSwitch.length > 0
-    ) {
-      this.harmonyBase.getDevicesAccessories(this, data);
-    }
-
-    if (
-      this.sequencesToPublishAsAccessoriesSwitch &&
-      this.sequencesToPublishAsAccessoriesSwitch.length > 0
-    ) {
-      this.harmonyBase.getSequencesAccessories(this, data);
-    }
-  },
-
   showActivity: function(activity) {
     return activity.id != -1 || this.showTurnOffActivity;
   },
@@ -98,7 +82,8 @@ HarmonyPlatformAsSwitches.prototype = {
       this.addAccessory(services, this.name);
     }
 
-    this.readOptionnalAccessories(data);
+    this.harmonyBase.getDevicesAccessories(this, data);
+    this.harmonyBase.getSequencesAccessories(this, data);
 
     //first refresh
 

diff --git a/harmonyAsTVPlatform.js b/harmonyAsTVPlatform.js
@@ -18,7 +18,7 @@ function HarmonyPlatformAsTVPlatform(log, config, api) {
   this.harmonyBase = new HarmonyBase(api);
   this.harmonyBase.configCommonProperties(log, config, api, this);
   this.mainActivity = config['mainActivity'];
-  this.playPauseBehavior = HarmonyTools.checkParemeter(
+  this.playPauseBehavior = HarmonyTools.checkParameter(
     config['playPauseBehavior'],
     false
   );
@@ -61,22 +61,7 @@ function HarmonyPlatformAsTVPlatform(log, config, api) {
 
 HarmonyPlatformAsTVPlatform.prototype = {
   onMessage(newActivity) {
-    this.updateCurrentInputService(newActivity);
-
-    this.harmonyBase.handleCharacteristicUpdate(
-      this,
-      this.mainService.controlService.getCharacteristic(Characteristic.Active),
-      this._currentActivity > 0,
-      null
-    );
-    this.harmonyBase.handleCharacteristicUpdate(
-      this,
-      this.mainService.controlService.getCharacteristic(
-        Characteristic.ActiveIdentifier
-      ),
-      this._currentActivity,
-      null
-    );
+    this.handleRefreshOfCharacteristic(newActivity);
   },
 
   ///CREATION / STARTUP
@@ -290,26 +275,28 @@ HarmonyPlatformAsTVPlatform.prototype = {
 
   ///REFRESHING TOOLS
 
+  handleRefreshOfCharacteristic(activity) {
+    this.updateCurrentInputService(activity);
+
+    this.harmonyBase.handleCharacteristicUpdate(
+      this,
+      this.mainService.controlService.getCharacteristic(Characteristic.Active),
+      this._currentActivity > 0,
+      null
+    );
+    this.harmonyBase.handleCharacteristicUpdate(
+      this,
+      this.mainService.controlService.getCharacteristic(
+        Characteristic.ActiveIdentifier
+      ),
+      this._currentActivity,
+      null
+    );
+  },
+
   refreshAccessory: function() {
     this.harmonyBase.refreshCurrentActivity(this, () => {
-      this.updateCurrentInputService(this._currentActivity);
-
-      this.harmonyBase.handleCharacteristicUpdate(
-        this,
-        this.mainService.controlService.getCharacteristic(
-          Characteristic.Active
-        ),
-        this._currentActivity > 0,
-        null
-      );
-      this.harmonyBase.handleCharacteristicUpdate(
-        this,
-        this.mainService.controlService.getCharacteristic(
-          Characteristic.ActiveIdentifier
-        ),
-        this._currentActivity,
-        null
-      );
+      this.handleRefreshOfCharacteristic(this._currentActivity);
     });
   },
 

diff --git a/harmonyBase.js b/harmonyBase.js
@@ -30,15 +30,15 @@ HarmonyBase.prototype = {
 
     harmonyPlatform.devicesToPublishAsAccessoriesSwitch =
       config['devicesToPublishAsAccessoriesSwitch'];
-    harmonyPlatform.publishDevicesAsIndividualAccessories = HarmonyTools.checkParemeter(
+    harmonyPlatform.publishDevicesAsIndividualAccessories = HarmonyTools.checkParameter(
       config['publishDevicesAsIndividualAccessories'],
       true
     );
 
     harmonyPlatform.sequencesToPublishAsAccessoriesSwitch =
       config['sequencesToPublishAsAccessoriesSwitch'];
 
-    harmonyPlatform.publishSequencesAsIndividualAccessories = HarmonyTools.checkParemeter(
+    harmonyPlatform.publishSequencesAsIndividualAccessories = HarmonyTools.checkParameter(
       config['publishSequencesAsIndividualAccessories'],
       true
     );
@@ -561,7 +561,7 @@ HarmonyBase.prototype = {
       harmonyPlatform.devicesToPublishAsAccessoriesSwitch.length > 0
     ) {
       harmonyPlatform.log('INFO - Loading devices...');
-      let services = [];
+      var services = [];
 
       for (
         let c = 0,
@@ -581,7 +581,8 @@ HarmonyBase.prototype = {
 
             //default mode
             if (commands.length === 1) {
-              services.concat(
+              services.push.apply(
+                services,
                 this.handleDefaultCommandMode(
                   harmonyPlatform,
                   controlGroup,
@@ -591,7 +592,8 @@ HarmonyBase.prototype = {
             }
             //specifc command or list mode
             else {
-              services.concat(
+              services.push.apply(
+                services,
                 this.handleSpecificCommandMode(
                   harmonyPlatform,
                   commands,
@@ -609,7 +611,7 @@ HarmonyBase.prototype = {
         services.length > 0
       ) {
         harmonyPlatform.log(
-          'INFO - Adding Accessory : ' + harmonyPlatform.name
+          'INFO - Adding Accessory : ' + harmonyPlatform.name + '-Devices'
         );
         let myHarmonyAccessory = new HarmonyTools.HarmonyAccessory(services);
         myHarmonyAccessory.getServices = function() {

diff --git a/harmonyTools.js b/harmonyTools.js
@@ -1,7 +1,7 @@
 const HarmonyConst = require('./harmonyConst');
 
 module.exports = {
-  checkParemeter: function(parameter, def) {
+  checkParameter: function(parameter, def) {
     if (parameter == undefined) return def;
     else return parameter;
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-harmony",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "author": "Nicolas Dujardin",
   "description": "Publish your harmony activities as homekit accessories",
   "main": "index.js",