iobroker.squeezeboxrpc 1.3.4 → 1.3.8

package/.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,24 @@
+# Automatically merge Dependabot PRs when version comparison is within the range
+# that is configured in .github/auto-merge.yml
+
+name: Auto-Merge Dependabot PRs
+
+on:
+  # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
+  # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
+  pull_request_target:
+
+jobs:
+  auto-merge:
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Check if PR should be auto-merged
+        uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          github-token: ${{ secrets.DEPENDABOT_SECRET }}
+          # By default, squash and merge, so Github chooses nice commit messages
+          command: squash and merge

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,22 @@ https://github.com/elParaguayo/LMS-CLI-Documentation/blob/master/LMS-CLI.md
 
 ## Changelog
 
+### 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
+* fix object creation for favorites
+### 1.3.4
+* fix object creation for favorites / * center widgets in sidebar
+### 1.3.3
+* repair imageproxy for image datapoints of favorites
+### 1.3.2
+* fix for Alarm contains only enabled Alarms
+### 1.3.1
+* fix problem with git dependency url
 ### 1.3.0
 * fix problem wit setting own icon in player widget / * add infos about alarms to a player datapoint
 ### 1.2.1
@@ -287,8 +303,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
@@ -306,3 +320,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.4",
+        "version": "1.3.8",
         "news": {
+            "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"
+            },
+            "1.3.5": {
+                "en": "* fix object creation for favorites"
+            },
             "1.3.4": {
                 "en": "* fix object creation for favorites / * center widgets in sidebar"
             },
@@ -17,40 +29,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",
@@ -84,6 +65,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
         },

package/lib/iosbserver.js

@@ -13,7 +13,7 @@ function IoSbServer(adapter) {
             name:   'LastScan',
             read:   true,
             write:  false,
-            type:   'number',
+            type:   'string',
             role:   'value',
             exist:  false
         },
@@ -167,7 +167,7 @@ function IoSbServer(adapter) {
             name:   'hasitems',
             read:   true,
             write:  false,
-            type:   'string',
+            type:   'number',
             role:   'value',
             exist:  false
         },
@@ -175,7 +175,7 @@ function IoSbServer(adapter) {
             name:   'url',
             read:   true,
             write:  false,
-            type:   'number',
+            type:   'string',
             role:   'media.url',
             exist:  false
         },
@@ -403,7 +403,6 @@ function IoSbServer(adapter) {
         if (this.adapter.config.usediscovery) this.doDiscoverServerClose();
     }    
     this.getServerstatus = function() {
-
         this.log.silly('getServerstatus');
         this.request('',['serverstatus', '0', '888'], this.doServerstatus.bind(this));
         this.request('',['syncgroups', '?'], this.doSyncgroups.bind(this));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.squeezeboxrpc",
-    "version": "1.3.4",
+    "version": "1.3.8",
     "description": "ioBroker Logitech Squeezebox Adapter over JSON/RPC-Protocol",
     "author": {
         "name": "oweitman",
@@ -31,7 +31,7 @@
         "@types/proxyquire": "^1.3.28",
         "@types/sinon": "^9.0.0",
         "@types/sinon-chai": "^3.2.4",
-        "axios": "^0.19.2",
+        "axios": "^0.21.1",
         "chai": "^4.2.0",
         "chai-as-promised": "^7.1.1",
         "eslint": "^6.8.0",

package/widgets/squeezeboxrpc/doc.html

@@ -358,6 +358,7 @@ Text oder HTML-Code, der der Zahl angehängt wird.
 Text, der im Editor testweise angezeigt werden soll
 <h5>Multiplikation - Erweiterte Einstellungen</h5>
 Multiplikation des zugrundeliegenden Wertes, um auf Millisekunden zu kommen.
+Da die Zeit in den Datenpunkten bei LMS meist in Sekunden angegeben sind, sollte der Wert hier 1000 betragen.
 <h5>Format - Erweiterte Einstellungen</h5>
 Zeichenkette um das Ergebnis entsprechend zu formatieren.
 alle Formatangaben vgl. <a href="https://github.com/jacwright/date.format">Github date.format.js</a><br>

package/widgets/squeezeboxrpc/js/squeezeboxrpc.js

@@ -335,6 +335,8 @@ vis.binds["squeezeboxrpc"] = {
                 if (!data.viewindex || data.viewindex.trim() == "") {
                     data.viewindex = this.getViewindex(players).join(", ");
                 }
+
+                data.defaultPlayer = data.defaultPlayer || Object.keys(players)[0] || "0";
                 
                 if (vis.editMode && data.bCount != Math.min(players.length,data.viewindex.split(',').length)) {               
                     data.bCount = Math.min(players.length,data.viewindex.split(',').length);
@@ -415,7 +417,7 @@ vis.binds["squeezeboxrpc"] = {
                                       
                     for (var i = 0; i < viewindex.length;i++) {
                         text += '  <div >';
-                        text += '    <input type="radio" id="'+ widgetID + players[viewindex[i]] +'" name="'+widgetID+'" value="' + players[viewindex[i]] + '" >';
+                        text += '    <input type="radio" id="'+ widgetID + players[viewindex[i]] +'" name="'+widgetID+'" value="' + players[viewindex[i]] + '" '+ (viewindex[i]==data.defaultPlayer?"checked":"")+'>';
                         text += '    <label for="'+ widgetID + players[viewindex[i]] + '">';
                         text += '      <span>';
                         var buttonsImage = (data['buttonsImage'+(parseInt(viewindex[i])+1)]) || '';
@@ -671,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

@@ -16,12 +16,12 @@
         type="text/ejs"
         class="vis-tpl"
 		data-vis-prev='<img style="display: block;margin-left: auto;margin-right: auto;width: 50%;" src="widgets/squeezeboxrpc/img/players.png"></img>'
-        data-vis-attrs="ainstance/id;formattype[formatbutton]/select,,formatbutton,formatselect;viewindex//checkViewIndex;wrapcamelcase[true]/checkbox;bCount/hidden;editmodehelper[true]/checkbox;"
+        data-vis-attrs="ainstance/id;formattype[formatbutton]/select,,formatbutton,formatselect;viewindex//checkViewIndex;defaultPlayer:wrapcamelcase[true]/checkbox;bCount/hidden;editmodehelper[true]/checkbox;"
 		data-vis-attrs0="group.buttonsettings;picWidth[50]/number;picHeight[50]/number;opacity[0.5]/slider,0,1,0.05;borderwidth[2px]/number/editDimension;borderstyle[solid]/nselect,,none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset,initial,inherit;bordercolornormal[#2e2e2e]/color;bordercoloractive[#87ceeb]/color;borderradius[5px]/number/editDimension;buttonbkcolor[#000000]/color;buttonmargin[0px]/number/editDimension;"
 		data-vis-attrs1="group.buttons/byindex;buttonsImage(1-bCount)/image;buttonsText(1-bCount);"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="false"
         data-vis-name="Players">
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 230px; height: 210px" id="<%= this.data.attr('wid') %>"><%
@@ -37,7 +37,7 @@
 		data-vis-attrs1="group.buttons/byindex;buttonsImage(1-bCount)/image;buttonsText(1-bCount);"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Favorites">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 230px; height: 210px" id="<%= this.data.attr('wid') %>"><%
@@ -52,7 +52,7 @@
 		data-vis-attrs0="group.svgsettings;fillcolor/color;strokecolor/color;strokewidth/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Play Button">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 50px" id="<%= this.data.attr('wid') %>"><%
@@ -67,7 +67,7 @@
 		data-vis-attrs0="group.svgsettings;fillcolor/color;strokecolor/color;strokewidth/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Fwd Button">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 50px" id="<%= this.data.attr('wid') %>"><%
@@ -82,7 +82,7 @@
 		data-vis-attrs0="group.svgsettings;fillcolor/color;strokecolor/color;strokewidth/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Rew Button">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 50px" id="<%= this.data.attr('wid') %>"><%
@@ -97,7 +97,7 @@
 		data-vis-attrs0="group.svgsettings;fillcolor/color;strokecolor/color;strokewidth/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Repeat Button">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 50px" id="<%= this.data.attr('wid') %>"><%
@@ -112,7 +112,7 @@
 		data-vis-attrs0="group.svgsettings;fillcolor/color;strokecolor/color;strokewidth/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Shuffle Button">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 50px" id="<%= this.data.attr('wid') %>"><%
@@ -127,7 +127,7 @@
 		data-vis-attrs0="group.segmentsettings;fillcolornormal[#005000]/color;fillcoloractive[#00ff00]/color;bordercolornormal/color;bordercoloractive/color;margin[1px];borderwidth[1px];"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Volume Bar">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 20px; height: 100px" id="<%= this.data.attr('wid') %>"><%
@@ -142,7 +142,7 @@
 		data-vis-attrs0="group.buttonsettings;borderwidth[2px]/number/editDimension;borderstyle[solid]/nselect,,none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset,initial,inherit;bordercolornogroup[#2e2e2e]/color;bordercolorowngroup[#87ceeb]/color;bordercolorothergroup[#ff0080]/color;borderradius[5px]/number/editDimension;buttonbkcolor[#000000]/color;buttonmargin[0px]/number/editDimension;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Syncgroup Widget">
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 230px; height: 210px" id="<%= this.data.attr('wid') %>"><%
@@ -156,7 +156,7 @@
         data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;mainbarcolor[#909090]/color;playtimebarcolor[#00ff00]/color;borderwidth[2px]/number/editDimension;borderstyle[solid]/nselect,,none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset,initial,inherit;bordercolor[#ffffff]/color;borderradius[2px]/number/editDimension;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Playtime bar">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 200px; height: 10px" id="<%= this.data.attr('wid') %>"><%
@@ -170,7 +170,7 @@
         data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;playerattribute/custom,squeezeboxrpc.playerAttrSelect;test_html;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="String">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="width: 50px; height: 20px" id="<%= this.data.attr('wid') %>"><%
@@ -184,7 +184,7 @@
         data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;playerattribute/custom,squeezeboxrpc.playerAttrSelect;html_prepend;html_append;test_html;group.extended;digits;is_comma[true]/checkbox;is_tdp/checkbox;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Number">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 20px" id="<%= this.data.attr('wid') %>"><%
@@ -195,10 +195,10 @@
         type="text/ejs"
         class="vis-tpl"
 		data-vis-prev='<img src="widgets/squeezeboxrpc/img/datetime.png"></img>'
-        data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;playerattribute/custom,squeezeboxrpc.playerAttrSelect;html_prepend;html_append;test_html;format;factor/number;"
+        data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;playerattribute/custom,squeezeboxrpc.playerAttrSelect;html_prepend;html_append;test_html;format;factor[1000]/number;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="false"
         data-vis-name="DateTime">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="overflow:visible; width: 50px; height: 20px" id="<%= this.data.attr('wid') %>"><%
@@ -212,7 +212,7 @@
         data-vis-attrs="widgetPlayer/custom,squeezeboxrpc.attrSelect;playerattribute/custom,squeezeboxrpc.playerAttrSelect;stretch/checkbox;html_prepend;html_append;test_html;"
         data-vis-set="squeezeboxrpc"
         data-vis-type="val"
-        data-vis-beta="true"
+        data-vis-beta="false"
         data-vis-update-style="true"
         data-vis-name="Image">        
     <div class="vis-widget <%== this.data.attr('class') %>" style="width: 100px; height: 100px" id="<%= this.data.attr('wid') %>">
@@ -221,4 +221,3 @@
     %>
     </div>
 </script>
-