iobroker.squeezeboxrpc 1.3.8 → 1.3.9

package/README.md

@@ -183,6 +183,9 @@ https://github.com/elParaguayo/LMS-CLI-Documentation/blob/master/LMS-CLI.md
 
 ## Changelog
 
+### 1.3.9
+* fix error with deleting favorites
+* fix wrong type for datapoint
 ### 1.3.8
 * fix forward button widget
 ### 1.3.7

package/io-package.json

@@ -1,8 +1,11 @@
 {
     "common": {
         "name": "squeezeboxrpc",
-        "version": "1.3.8",
+        "version": "1.3.9",
         "news": {
+            "1.3.9": {
+                "en": "* fix error with deleting favorites * fix wrong type for datapoint"
+            },
             "1.3.8": {
                 "en": "* fix object forward btn widget"
             },

package/lib/iosbplayer.js

@@ -496,7 +496,7 @@ function ioSBPlayer(server,playerdata) {
     this.doAlarmsUpdateStatus = function(result) {
         this.log.silly('doAlarmsUpdateStatus');
         let alarmdata = JSON.stringify(result.result);
-        this.setState(this.sbPlayerStatusMain['alarms'].name,alarmdata,this.statePath,this.playername);
+        this.setState(this.sbPlayerStatusMain['alarms'].name,this.convertState(this.sbPlayerStatusMain['alarms'],alarmdata),this.statePath,this.playername);
     };
     this.doPlayerUpdateStatus = function(result) {
         this.log.silly('doPlayerUpdateStatus');
@@ -504,7 +504,7 @@ function ioSBPlayer(server,playerdata) {
         let playerdata = result.result;
 
         for (const key in this.sbPlayerStatusMain) {
-            let value = null;
+            let value = "";
             if (key == 'state') continue;
             if (key == 'playlist') continue;
             if (key == 'playerid') continue;
@@ -529,13 +529,13 @@ function ioSBPlayer(server,playerdata) {
                 if (key == 'remote')        value = 0;
                 if (key == 'remote')        this.remote = 0;
             }
-            this.setState(this.sbPlayerStatusMain[key].name,value,this.statePath,this.playername);
+            this.setState(this.sbPlayerStatusMain[key].name,this.convertState(this.sbPlayerStatusMain[key],value),this.statePath,this.playername);
         }
-        this.setState(this.sbPlayerStatusMain['playerid'].name,this.playerid,this.statePath,this.playername);
+        this.setState(this.sbPlayerStatusMain['playerid'].name,this.convertState(this.sbPlayerStatusMain['playerid'],this.playerid),this.statePath,this.playername);
         if (!result.result.playlist_loop) return;
         playerdata = result.result.playlist_loop.find(function(el){return el['playlist index']==this.playlist_cur_index;}.bind(result.result));
         for (const key in this.sbPlayerStatusLoop) {
-            let value = null;
+            let value = "";
             if (playerdata.hasOwnProperty(key)) {
                 value = playerdata[key];
                 if (key == 'coverid') {
@@ -555,12 +555,12 @@ function ioSBPlayer(server,playerdata) {
                         value = decodeURIComponent(m[1]);
                     }
                 }
-                this.setState(this.sbPlayerStatusLoop[key].name,value,this.statePath,this.playername);
+                this.setState(this.sbPlayerStatusLoop[key].name,this.convertState(this.sbPlayerStatusLoop[key],value),this.statePath,this.playername);
             } else {
                 if (key == 'remote_title' && this.remote == 0 ) {
                     value = '';
                 }
-                if (fullStatus) this.setState(this.sbPlayerStatusLoop[key].name,value,this.statePath,this.playername);
+                if (fullStatus) this.setState(this.sbPlayerStatusLoop[key].name,this.convertState(this.sbPlayerStatusLoop[key],value),this.statePath,this.playername);
             }
         }
         if (fullStatus) {
@@ -596,9 +596,9 @@ function ioSBPlayer(server,playerdata) {
                 pla.push(pli);
             }
             if (this.adapter.config.useplaylist) {
-                this.setState(this.sbPlayerStatusMain['playlist'].name,JSON.stringify(pla),this.statePath,this.playername);
+                this.setState(this.sbPlayerStatusMain['playlist'].name,this.convertState(this.sbPlayerStatusMain['playlist'],JSON.stringify(pla)),this.statePath,this.playername);
             } else {
-                this.setState(this.sbPlayerStatusMain['playlist'].name,'',this.statePath,this.playername);
+                this.setState(this.sbPlayerStatusMain['playlist'].name,this.convertState(this.sbPlayerStatusMain['playlist'],''),this.statePath,this.playername);
             }
         }
         return;
@@ -772,11 +772,6 @@ function ioSBPlayer(server,playerdata) {
         stateTemplate.exist = true;
         return stateTemplate;
     }
-
-    
-    
-    
-    
     this.request = function(playerid,params, callback) {
         if (this.connected) this.server.request(playerid, params, callback);
     };
@@ -793,6 +788,12 @@ function ioSBPlayer(server,playerdata) {
             this.adapter.setState(name, value, true);
         }
     };
+    this.convertState = function(stateTemplate,value) {
+        if (stateTemplate.type == "string") return String(value);
+        if (stateTemplate.type == "number") return Number(value);
+        this.log.debug('Missing conversion function for type ' + stateTemplate.type + ' Please report.');
+        return value;
+    }
     this.log.silly = function(s) {
         if (this.logsilly) this.adapter.log.silly(s);
     }.bind(this);

package/lib/iosbserver.js

@@ -417,15 +417,12 @@ function IoSbServer(adapter) {
         this.checkServerstatusStates(result);
         for (const key in this.sbServerStatus){
             if (result.result.hasOwnProperty(key)) {
-                this.setState(this.sbServerStatus[key].name,result.result[key],this.ServerStatePath);
+                this.setState(this.sbServerStatus[key].name,this.convertState(this.sbServerStatus[key],result.result[key]),this.ServerStatePath);
             }
         }
         this.checkNewPlayer(result.result.players_loop);
         this.checkPlayer(result.result.players_loop);
     };
-
-
-
     this.newgetFavorites = function() {
         this.log.silly('newgetFavorites');
         this.newgetFavoritesDP(
@@ -469,7 +466,7 @@ function IoSbServer(adapter) {
         }
         Promise.all(promises).then(function(){
             this.log.debug(`All favorite objects deleted`);
-            callback();
+            if (callback) callback();
         }.bind(this));
     };
     this.newsetFavoritesDP = function(favorites) {
@@ -490,7 +487,7 @@ function IoSbServer(adapter) {
                     }
                     const stateTemplate = this.sbFavoritesState[key];
                     this.createObject(stateTemplate,this.FavoritesStatePath,id,
-                        ()=>this.setState(this.sbFavoritesState[key].name,favorite[key],this.FavoritesStatePath,id,false)
+                        ()=>this.setState(this.sbFavoritesState[key].name,this.convertState(this.sbFavoritesState[key],favorite[key]),this.FavoritesStatePath,id,false)
                     );
                 }
             }
@@ -754,13 +751,12 @@ function IoSbServer(adapter) {
         stateTemplate.exist = true;
         return stateTemplate;
     };
-    
-    
-    
-    
-    
-    this.test = function() {
-    };
+    this.convertState = function(stateTemplate,value) {
+        if (stateTemplate.type == "string") return String(value);
+        if (stateTemplate.type == "number") return Number(value);
+        this.log.debug('Missing conversion function for type ' + stateTemplate.type + ' Please report.');
+        return value;
+    }
     this.log.silly = function(s) {
         if (this.logsilly) this.adapter.log.silly(s);
     }.bind(this);
@@ -773,7 +769,6 @@ function IoSbServer(adapter) {
     this.log.info = function(s) {
         this.adapter.log.info(s);
     }.bind(this);
-this.test();
     this.getDiscoverServers();
     this.sbServer.on('register', this.init.bind(this));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.squeezeboxrpc",
-    "version": "1.3.8",
+    "version": "1.3.9",
     "description": "ioBroker Logitech Squeezebox Adapter over JSON/RPC-Protocol",
     "author": {
         "name": "oweitman",