v.3.34.1

jemu75 · Apr 5, 2022 · 662eb39 · 662eb39
1 parent 83ad824
commit 662eb39
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.34.0",
+  "version": "3.34.1",
   "private": true,
   "author": "jemu75",
   "scripts": {

diff --git a/public/cfg/templ_sonosplay.json b/public/cfg/templ_sonosplay.json
@@ -23,6 +23,11 @@
     {
       "text": ["currentTrackPositionSimulated::%s"],
       "text2": ["nextTrackHandle:^\\|:", "tracks_app::%s"]
+    },
+    {
+      "text": ["currentArtist:$:%s", "currentSource::%s"],
+      "rightBtn": "mdi-dots-vertical",
+      "rightMenu": ["MDR JUMP:StartFavourite MDR%20JUMP","Antenne Bayern Chillout Lounge:StartFavourite ANTENNE%20BAYERN%20Chillout","Absolut relax:StartFavourite Absolut%20relax","Radio Chemnitz:StartFavourite Radio%20Chemnitz"]
     }
   ],
   "info": {

diff --git a/src/components/TemplDefault.vue b/src/components/TemplDefault.vue
@@ -121,7 +121,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.leftMenu"
                           :key="i"
-                          @click="sendCmd(menu.cmd)"
+                          @click="sendMenuCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -225,7 +225,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.midMenu"
                           :key="i"
-                          @click="sendCmd(menu.cmd)"
+                          @click="sendMenuCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -332,7 +332,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.rightMenu"
                           :key="i"
-                          @click="sendCmd(menu.cmd)"
+                          @click="sendMenuCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -472,6 +472,12 @@
         }
       },
 
+      sendMenuCmd(cmd) {
+        let device = this.$fhem.getEl(this.item, 'Internals', 'NAME');
+        if(/%d/.test(cmd)) cmd = cmd.replace('%d', device);
+        this.sendCmd(cmd);
+      },
+
       updateReading(cmd) {
         let cmdParts = cmd.split(' ');
 
@@ -486,7 +492,7 @@
       createCmd(param) {
         let result = '';
 
-        if(param.match('set')) {
+        if(param.match('set') || param.match('get')) {
           let parts = param.trim().split(' ');
           if(parts[1] && parts[1].match('Connected')) {
             let device = parts[1].replace('Connected.','');

diff --git a/www/fhemapp/cfg/templ_sonosplay.json b/www/fhemapp/cfg/templ_sonosplay.json
@@ -23,6 +23,11 @@
     {
       "text": ["currentTrackPositionSimulated::%s"],
       "text2": ["nextTrackHandle:^\\|:", "tracks_app::%s"]
+    },
+    {
+      "text": ["currentArtist:$:%s", "currentSource::%s"],
+      "rightBtn": "mdi-dots-vertical",
+      "rightMenu": ["MDR JUMP:StartFavourite MDR%20JUMP","Antenne Bayern Chillout Lounge:StartFavourite ANTENNE%20BAYERN%20Chillout","Absolut relax:StartFavourite Absolut%20relax","Radio Chemnitz:StartFavourite Radio%20Chemnitz"]
     }
   ],
   "info": {

diff --git a/www/fhemapp/css/622.b79779ed.css → www/fhemapp/css/617.b79779ed.css b/www/fhemapp/css/622.b79779ed.css → www/fhemapp/css/617.b79779ed.css
diff --git a/www/fhemapp/index.html b/www/fhemapp/index.html
@@ -1 +1 @@
-<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.f375194c.js"></script><link href="css/chunk-vendors.e9ac34b8.css" rel="stylesheet"><link href="css/app.0cad59f4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.2d8022e1.js" nomodule></script></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.fb12ea5f.js"></script><link href="css/chunk-vendors.e9ac34b8.css" rel="stylesheet"><link href="css/app.0cad59f4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.f37fcced.js" nomodule></script></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
diff --git a/www/fhemapp/js/617-legacy.1d5c53e3.js b/www/fhemapp/js/617-legacy.1d5c53e3.js
diff --git a/www/fhemapp/js/617.e31d04c8.js b/www/fhemapp/js/617.e31d04c8.js
diff --git a/www/fhemapp/js/622-legacy.e21bf225.js b/www/fhemapp/js/622-legacy.e21bf225.js
diff --git a/www/fhemapp/js/622.be973053.js b/www/fhemapp/js/622.be973053.js
diff --git a/www/fhemapp/js/743-legacy.850b5d54.js → www/fhemapp/js/743-legacy.e881f02b.js b/www/fhemapp/js/743-legacy.850b5d54.js → www/fhemapp/js/743-legacy.e881f02b.js
diff --git a/www/fhemapp/js/743.88df4816.js → www/fhemapp/js/743.db0d8878.js b/www/fhemapp/js/743.88df4816.js → www/fhemapp/js/743.db0d8878.js
diff --git a/www/fhemapp/js/app-legacy.2d8022e1.js → www/fhemapp/js/app-legacy.f37fcced.js b/www/fhemapp/js/app-legacy.2d8022e1.js → www/fhemapp/js/app-legacy.f37fcced.js
diff --git a/www/fhemapp/js/app.f375194c.js → www/fhemapp/js/app.fb12ea5f.js b/www/fhemapp/js/app.f375194c.js → www/fhemapp/js/app.fb12ea5f.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.f375194c.js"></script><link href="css/chunk-vendors.e9ac34b8.css" rel="stylesheet"><link href="css/app.0cad59f4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.2d8022e1.js" nomodule></script></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
		<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.fb12ea5f.js"></script><link href="css/chunk-vendors.e9ac34b8.css" rel="stylesheet"><link href="css/app.0cad59f4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.f37fcced.js" nomodule></script></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>