iobroker.squeezeboxrpc 1.3.6 → 1.3.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2020 oweitman
+Copyright (c) 2019-2021 oweitman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -183,6 +183,15 @@ https://github.com/elParaguayo/LMS-CLI-Documentation/blob/master/LMS-CLI.md
 
 ## Changelog
 
+### 1.3.10
+* getalbumartist as artist if setting of TPE2/TPE3 in LMS are changed"
+### 1.3.9
+* fix error with deleting favorites
+* fix wrong type for datapoint
+### 1.3.8
+* fix forward button widget
+### 1.3.7
+* fix object creation of states in player modul
 ### 1.3.6
 * fix object creation of states
 ### 1.3.5
@@ -299,8 +308,6 @@ https://github.com/elParaguayo/LMS-CLI-Documentation/blob/master/LMS-CLI.md
 ## License
 MIT License
 
-Copyright (c) 2019-2020 oweitman
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -318,3 +325,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+Copyright (c) 2019-2021 oweitman

package/io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "squeezeboxrpc",
-        "version": "1.3.6",
+        "version": "1.3.10",
         "news": {
+            "1.3.10": {
+                "en": "* getalbumartist as artist if setting of TPE2/TPE3 in LMS are changed"
+            },
+            "1.3.9": {
+                "en": "* fix error with deleting favorites * fix wrong type for datapoint"
+            },
+            "1.3.8": {
+                "en": "* fix object forward btn widget"
+            },
+            "1.3.7": {
+                "en": "* fix object creation of states in player modul"
+            },
             "1.3.6": {
                 "en": "* fix object creation of states"
             },
@@ -23,40 +35,9 @@
             },
             "1.3.0": {
                 "en": "* fix problem wit setting own icon in player widget / * add infos about alarms to a player datapoint"
-            },
-            "1.2.1": {
-                "en": "* fix small issues in last version"
-            },
-            "1.2.0": {
-                "en": "* improve handling of imageproxy artwork"
-            },
-            "1.1.0": {
-                "en": "* make request of favorites configurable"
-            },
-            "1.0.1": {
-                "en": " * change setstate/createobject logic * fix role and type for Mode-state * update tests * update dependency versions * improve io-package.json"
-            },
-            "1.0.0": {
-                "en": "prepare for stable repository"
-            },
-            "0.8.32": {
-                "en": "the adapter function iobroker.deleteChannel didnt works as expected. it didnt delete the whole subtree of states. now i implement my own delete function"
-            },
-            "0.8.31": {
-                "en": "change behaviour of deleting favorites"
-            },
-            "0.8.30": {
-                "en": "change from the issue of the adapter checker"
-            },
-            "0.8.29": {
-                "en": "optimize handling of player state power and connected"
-            },
-            "0.8.28": {
-                "en": "add advanced signaling function with telnet and fix some more authorization issues with LMS"
             }
         },
         "title": "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
-        "desc":  "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
         "desc": {
             "en": "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
             "de": "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
@@ -90,6 +71,8 @@
         "type": "multimedia",
         "compact": true,
         "materialize": true,
+        "connectionType":"local",
+        "dataSource":"poll",
         "restartAdapters": [
             "vis"
         ],

package/lib/iosbplayer.js

@@ -70,7 +70,7 @@ function ioSBPlayer(server,playerdata) {
             name:   'Mode',
             read:   true,
             write:  false,
-            type:   'number',
+            type:   'string',
             role:   'media.state',
             exist:  false
         },
@@ -248,6 +248,14 @@ function ioSBPlayer(server,playerdata) {
             role:   'media.artist',
             exist:  false
         },
+        'albumartist': {
+            name:   'Artist',
+            read:   true,
+            write:  false,
+            type:   'string',
+            role:   'media.artist',
+            exist:  false
+        },
         'url': {
             name:   'Url',
             read:   true,
@@ -496,7 +504,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 +512,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 +537,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 +563,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 +604,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;
@@ -622,7 +630,8 @@ function ioSBPlayer(server,playerdata) {
                 this.sbPlayerStatusMain[key]=this.createObject(stateTemplate,this.statePath, this.playername);
             }
         }
-        for (const key in this.sbPlayerStatusLoop ) {
+        for (var key in this.sbPlayerStatusLoop ) {
+            if (key=="albumartist") key="artist";
             const stateTemplate = this.sbPlayerStatusLoop[key];
             if (!stateTemplate.exist) {
                 this.sbPlayerStatusLoop[key]=this.createObject(stateTemplate,this.statePath, this.playername);
@@ -772,11 +781,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 +797,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.6",
+    "version": "1.3.10",
     "description": "ioBroker Logitech Squeezebox Adapter over JSON/RPC-Protocol",
     "author": {
         "name": "oweitman",

package/widgets/squeezeboxrpc/js/squeezeboxrpc.js

@@ -673,7 +673,7 @@ vis.binds["squeezeboxrpc"] = {
                 var data = event.data.data;
                 var self = event.data.self;
                 var playername = vis.binds["squeezeboxrpc"].getPlayerName(data.widgetPlayer);
-                var stateid = data.ainstance.join('.')+".Players"+"."+playername+".btnRewind";
+                var stateid = data.ainstance.join('.')+".Players"+"."+playername+".btnForward";
                 var state = true
                 vis.setValue(stateid,state);
         },        

package/widgets/squeezeboxrpc.html

@@ -221,4 +221,3 @@
     %>
     </div>
 </script>
-