From 8a49b1f3255f4f0e48836da561d2a7a7e2a18c4c Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 29 Jun 2011 18:10:27 +0300
Subject: [PATCH] Update MPRIS' Metadata on started_playing/stopped_playing

---
 mopidy/frontends/mpris.py            |  2 ++
 tests/frontends/mpris/events_test.py | 34 ++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mopidy/frontends/mpris.py b/mopidy/frontends/mpris.py
index e99360a0..8291a226 100644
--- a/mopidy/frontends/mpris.py
+++ b/mopidy/frontends/mpris.py
@@ -127,6 +127,7 @@ class MprisFrontend(ThreadingActor, BackendListener):
         if self.mpris_object is None:
             return
         self.mpris_object.PropertiesChanged(PLAYER_IFACE, {
+            'Metadata': self.mpris_object.Get(PLAYER_IFACE, 'Metadata'),
             'PlaybackStatus':
                 self.mpris_object.Get(PLAYER_IFACE, 'PlaybackStatus'),
         }, [])
@@ -135,6 +136,7 @@ class MprisFrontend(ThreadingActor, BackendListener):
         if self.mpris_object is None:
             return
         self.mpris_object.PropertiesChanged(PLAYER_IFACE, {
+            'Metadata': self.mpris_object.Get(PLAYER_IFACE, 'Metadata'),
             'PlaybackStatus':
                 self.mpris_object.Get(PLAYER_IFACE, 'PlaybackStatus'),
         }, [])
diff --git a/tests/frontends/mpris/events_test.py b/tests/frontends/mpris/events_test.py
index 9abca16c..b9a6ba77 100644
--- a/tests/frontends/mpris/events_test.py
+++ b/tests/frontends/mpris/events_test.py
@@ -13,31 +13,37 @@ class BackendEventsTest(unittest.TestCase):
     def test_paused_playing_event_changes_playback_status(self):
         self.mpris_object.Get.return_value = 'Paused'
         self.mpris_frontend.paused_playing(Track(), 0)
-        self.mpris_object.Get.assert_called_with(
-            PLAYER_IFACE, 'PlaybackStatus')
+        self.assertListEqual(self.mpris_object.Get.call_args_list, [
+            ((PLAYER_IFACE, 'PlaybackStatus'), {}),
+        ])
         self.mpris_object.PropertiesChanged.assert_called_with(
             PLAYER_IFACE, {'PlaybackStatus': 'Paused'}, [])
 
     def test_resumed_playing_event_changes_playback_status(self):
         self.mpris_object.Get.return_value = 'Playing'
         self.mpris_frontend.resumed_playing(Track(), 0)
-        self.mpris_object.Get.assert_called_with(
-            PLAYER_IFACE, 'PlaybackStatus')
+        self.assertListEqual(self.mpris_object.Get.call_args_list, [
+            ((PLAYER_IFACE, 'PlaybackStatus'), {}),
+        ])
         self.mpris_object.PropertiesChanged.assert_called_with(
             PLAYER_IFACE, {'PlaybackStatus': 'Playing'}, [])
 
-    def test_started_playing_event_changes_playback_status(self):
-        self.mpris_object.Get.return_value = 'Playing'
+    def test_started_playing_event_changes_playback_status_and_metadata(self):
+        self.mpris_object.Get.return_value = '...'
         self.mpris_frontend.started_playing(Track())
-        self.mpris_object.Get.assert_called_with(
-            PLAYER_IFACE, 'PlaybackStatus')
+        self.assertListEqual(self.mpris_object.Get.call_args_list, [
+            ((PLAYER_IFACE, 'Metadata'), {}),
+            ((PLAYER_IFACE, 'PlaybackStatus'), {}),
+        ])
         self.mpris_object.PropertiesChanged.assert_called_with(
-            PLAYER_IFACE, {'PlaybackStatus': 'Playing'}, [])
+            PLAYER_IFACE, {'Metadata': '...', 'PlaybackStatus': '...'}, [])
 
-    def test_stopped_playing_event_changes_playback_status(self):
-        self.mpris_object.Get.return_value = 'Stopped'
+    def test_stopped_playing_event_changes_playback_status_and_metadata(self):
+        self.mpris_object.Get.return_value = '...'
         self.mpris_frontend.stopped_playing(Track(), 0)
-        self.mpris_object.Get.assert_called_with(
-            PLAYER_IFACE, 'PlaybackStatus')
+        self.assertListEqual(self.mpris_object.Get.call_args_list, [
+            ((PLAYER_IFACE, 'Metadata'), {}),
+            ((PLAYER_IFACE, 'PlaybackStatus'), {}),
+        ])
         self.mpris_object.PropertiesChanged.assert_called_with(
-            PLAYER_IFACE, {'PlaybackStatus': 'Stopped'}, [])
+            PLAYER_IFACE, {'Metadata': '...', 'PlaybackStatus': '...'}, [])