Show player-supplied MPRIS Identity instead of dbus interface part if…

… available
jgibbon · Feb 26, 2023 · 9945c8d · 9945c8d
1 parent eee8816
commit 9945c8d
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 32 deletions.
diff --git a/main/qml/lib/MprisPlayingScanner.qml b/main/qml/lib/MprisPlayingScanner.qml
@@ -12,8 +12,9 @@ Item {
 
     property bool mprisIsPlaying: false
     property string mprisPlayingService
-    property string mprisPlayingName: {
-        var match = mprisPlayingService.match(/([^.]+)$/);
+    property string mprisPlayingName
+    function getNameFromService(service) {
+        var match = service.match(/([^.]+)$/);
         return match ? match[0] : '';
     }
 
@@ -83,14 +84,21 @@ Item {
                 service: dbusService
                 path: '/org/mpris/MediaPlayer2'
                 iface: 'org.mpris.MediaPlayer2.Player'
+                property DBusInterface playerInfo: DBusInterface {
+                    service: dbif.service
+                    path: dbif.path
+                    iface: 'org.mpris.MediaPlayer2'
+                }
                 property bool isPlaying: false
                 onIsPlayingChanged: {
                     if(isPlaying) {
                         scanner.mprisPlayingService = service;
+                        scanner.mprisPlayingName =  playerInfo.getProperty('Identity') || getNameFromService(service);
                         scanner.mprisIsPlaying = true;
                     } else {
                         if(scanner.mprisPlayingService === service) {
                             scanner.mprisPlayingService = '';
+                            scanner.mprisPlayingName = '';
                             scanner.mprisIsPlaying = false;
                         }
                     }
@@ -108,6 +116,7 @@ Item {
                 Component.onDestruction: {
                     if(scanner.mprisPlayingService === service) {
                         scanner.mprisPlayingService = '';
+                        scanner.mprisPlayingName = '';
                         scanner.mprisIsPlaying = false;
                     }
                 }

diff --git a/main/translations/harbour-slumber-de.ts b/main/translations/harbour-slumber-de.ts
@@ -81,13 +81,13 @@ ziehe herunter für Einstellungen</translation>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 spielt ab</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>gestoppt…</translation>

diff --git a/main/translations/harbour-slumber-en.ts b/main/translations/harbour-slumber-en.ts
@@ -81,13 +81,13 @@ pull down for options</translation>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 is playing</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>stopped…</translation>

diff --git a/main/translations/harbour-slumber-es.ts b/main/translations/harbour-slumber-es.ts
@@ -81,13 +81,13 @@ tira hacia abajo para opciones</translation>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Inicio automático: %1 se está reproduciendo</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>detenido...</translation>

diff --git a/main/translations/harbour-slumber-fi.ts b/main/translations/harbour-slumber-fi.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-fr.ts b/main/translations/harbour-slumber-fr.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Démarrage auto : %1 est en train d&apos;être joué</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-hu.ts b/main/translations/harbour-slumber-hu.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Automatikus indítás: %1 lejátszása</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-it.ts b/main/translations/harbour-slumber-it.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 in riproduzione</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-nl.ts b/main/translations/harbour-slumber-nl.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 wordt afgespeeld</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-nl_BE.ts b/main/translations/harbour-slumber-nl_BE.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 wordt afgespeeld</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-pl.ts b/main/translations/harbour-slumber-pl.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 jest odtwarzany</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>zatrzymany...</translation>

diff --git a/main/translations/harbour-slumber-ru.ts b/main/translations/harbour-slumber-ru.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Автозапуск: % 1 играет</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>

diff --git a/main/translations/harbour-slumber-sl_SI.ts b/main/translations/harbour-slumber-sl_SI.ts
@@ -81,13 +81,13 @@ za možnosti potegni navzdol</translation>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Samodejni zagon: %1 se predvaja</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>zaustavljeno ...</translation>

diff --git a/main/translations/harbour-slumber-sv.ts b/main/translations/harbour-slumber-sv.ts
@@ -81,13 +81,13 @@ dra ner för alternativ</translation>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>Autostart: %1 spelas</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>stoppad...</translation>

diff --git a/main/translations/harbour-slumber-zh.ts b/main/translations/harbour-slumber-zh.ts
@@ -81,13 +81,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation>自动启动: %1 正在播放</translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation>已停止…</translation>

diff --git a/main/translations/harbour-slumber.ts b/main/translations/harbour-slumber.ts
@@ -79,13 +79,13 @@ pull down for options</source>
 <context>
     <name>MprisPlayingScanner</name>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="27"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="28"/>
         <source>Autostart: %1 is playing</source>
         <extracomment>Notification text: %1 is the identifier of the current media player. This string is prefixed with &quot;slumber &quot;: &quot;slumber Autostart: …&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/lib/MprisPlayingScanner.qml" line="32"/>
+        <location filename="../qml/lib/MprisPlayingScanner.qml" line="33"/>
         <source>stopped…</source>
         <extracomment>Notification text: Current media player has stopped. This string is prefixed with &quot;slumber &quot;: &quot;slumber stopped…&quot;</extracomment>
         <translation type="unfinished"></translation>