fix music navs

tests/fakes.py

@@ -32,6 +32,7 @@ class FakeHeos(threading.Thread):
         self.group_volumes = {3: 25}
         self.now_playing_mid = {1: "inputs/mediaplayer"}  # pid -> what get_now_playing_media reports
         self.now_playing_sid = {}                     # pid -> its source id; 4 is Spotify
+        self.now_playing_track = {}                   # pid -> song/artist/image_url fields
         self.commands = []                            # everything we were asked to do
         self.server = socket.socket()
         self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -124,6 +125,7 @@ class FakeHeos(threading.Thread):
             payload = {"mid": mid, "station": name} if mid else {}
             if pid in self.now_playing_sid:
                 payload["sid"] = self.now_playing_sid[pid]
+            payload.update(self.now_playing_track.get(pid, {}))
             return self._ok(path, payload=payload)
 
         if path == "browse/browse":

tests/test_panel.py

@@ -182,6 +182,39 @@ class PanelTest(unittest.TestCase):
         state = self.panel.state()
         self.assertEqual([r["spotify"] for r in state["rooms"]], [True, False])
 
+    def test_state_carries_the_song_a_room_is_playing(self):
+        self.heos.now_playing_mid[HOME400_PID] = "spotify:track:4uLU6hMCjMI75M1A2tKUQC"
+        self.heos.now_playing_track[HOME400_PID] = {
+            "song": "Harvest Moon", "artist": "Neil Young", "image_url": "https://i.scdn.co/image/abc",
+        }
+        state = self.panel.state()
+        self.assertEqual(
+            [r["now_playing"] for r in state["rooms"]],
+            [{"song": "Harvest Moon", "artist": "Neil Young", "image": "https://i.scdn.co/image/abc"}, None],
+        )
+
+    def test_a_song_without_artist_or_cover_still_shows(self):
+        self.heos.now_playing_mid[HOME400_PID] = "spotify:track:4uLU6hMCjMI75M1A2tKUQC"
+        self.heos.now_playing_track[HOME400_PID] = {"song": "Harvest Moon", "artist": "", "image_url": ""}
+        self.assertEqual(
+            self.panel.state()["rooms"][0]["now_playing"],
+            {"song": "Harvest Moon", "artist": None, "image": None},
+        )
+
+    def test_a_paused_room_keeps_its_song_and_a_stopped_one_drops_it(self):
+        self.heos.now_playing_mid[HOME400_PID] = "spotify:track:4uLU6hMCjMI75M1A2tKUQC"
+        self.heos.now_playing_track[HOME400_PID] = {"song": "Harvest Moon"}
+        self.heos.play_states[HOME400_PID] = "pause"
+        self.assertIsNotNone(self.panel.state()["rooms"][0]["now_playing"])
+        self.heos.play_states[HOME400_PID] = "stop"
+        self.assertIsNone(self.panel.state()["rooms"][0]["now_playing"])
+
+    def test_an_avr_input_is_not_a_song(self):
+        """HEOS puts an input's own name where the song goes."""
+        self.heos.now_playing_mid[HOME400_PID] = "inputs/mediaplayer"
+        self.heos.now_playing_track[HOME400_PID] = {"song": "Z30 Pro"}
+        self.assertIsNone(self.panel.state()["rooms"][0]["now_playing"])
+
     def test_an_avr_input_is_not_spotify(self):
         self.heos.now_playing_sid[AVR_PID] = 1027
         self.assertFalse(self.panel.on_spotify("avr"))